add

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGFWebsitWorkerServiceImpl.java

@@ -893,7 +893,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                 log.info("tets");
             }*/
             // 已处理过不再处理 因为这里是网点师傅会存在重复数据
-            if (sfzens.contains(m.getSfzen() + m.getWxgmc() + m.getYddh())){
+            if (sfzens.contains(m.getSfzen() + m.getWxgmc().trim() + m.getYddh())){
                 continue;
             }
             // 生成对象
@@ -941,7 +941,6 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
     @Transactional(rollbackFor = Exception.class)
     public void addWorker(List<ItfTblWangdianWxgDownload> Recs) {
         List<Worker> addWorkerRec = new ArrayList<>();
-        // 新增的
         if (Recs.size()>0){
             // worker:师傅信息
             extractedWorkerAddNew(Recs, addWorkerRec);

src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceUploadListServiceImpl.java

@@ -107,7 +107,7 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
                     if (itemTableName.equals("order_install_operating_log")){
                         orderInstallOperatingLog(item, itemTableName, itemOrderType);
                     }
-                    // 安装工单用户预约、改约明细 230 同时向发短信表插入一条数据
+                    // 安装工单用户预约、改约明细 230-改成69 同时向发短信表插入一条数据
                     if (itemTableName.equals("order_re_appointment") &&
                             itemOrderType.equals(OrderTypeEnum.ORDER_TYPE_INSTALL.getCode())){
                         OrderReAppointment(item, itemTableName, itemOrderType);
@@ -184,7 +184,7 @@ public class InstallProduceUploadListServiceImpl implements InstallProduceUpload
         // 同步任务增加一条数据
         if (rea !=null){
             OutJiasmToGreeUploadTaskList add = publicService.getUploadTaskList(item.getOrderNo(), item.getId(),
-                    rea.getCreateTime(), itemTableName, itemOrderType, 230);
+                    rea.getCreateTime(), itemTableName, itemOrderType, 69);
             outJiasmToGreeUploadTaskListService.save(add);
             // 向发短信表插入一条数据，短信表ID同预约改约表ID相同
             publicService.addFaOrderSms(rea);

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceUploadListServiceImpl.java

@@ -124,7 +124,7 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
                         // TL_PrePare_task_by_fa_order_repair_operating_log
                         logProess(item, itemTableName, itemOrderNo, itemTableNameId, itemOrderType);
                     }
-                    // 维修单用户预约、改约明细 230 同时向发短信表插入一条数据
+                    // 维修单用户预约、改约明细 230-改成69 同时向发短信表插入一条数据
                     if (itemTableName.equals("order_re_appointment") &&
                             itemOrderType.equals(OrderTypeEnum.ORDER_TYPE_REPAIR.getCode())){
                         OrderReAppointment(item, itemTableName, itemOrderType);
@@ -291,7 +291,7 @@ public class RepairProduceUploadListServiceImpl implements RepairProduceUploadLi
         // 同步任务增加一条数据
         if (rea !=null){
             OutJiasmToGreeUploadTaskList add = publicService.getUploadTaskList(item.getOrderNo(), item.getId(),
-                    rea.getCreateTime(), itemTableName, itemOrderType, 230);
+                    rea.getCreateTime(), itemTableName, itemOrderType, 69);
             outJiasmToGreeUploadTaskListService.save(add);
             // 向发短信表插入一条数据，短信表ID同预约改约表ID相同
             publicService.addFaOrderSms(rea);