add

src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusinessApi.java

@@ -77,7 +77,7 @@ public class RepairBusinessApi {
         // 提取待落本地表的数据
         repairRec = itfTblAssignDownloadService.lambdaQuery()
                 .eq(ItfTblAssignDownload::getSynStatus, 0)
-                // .eq(ItfTblAssignDownload::getSynReqId, -1L)// 测试使用
+                // .eq(ItfTblAssignDownload::getSynReqId, 125555L)// 测试使用
                 .lt(ItfTblAssignDownload::getSynTimes, 2)
                 .orderByAsc(ItfTblAssignDownload::getSynReqId)
                 .list();

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

@@ -694,13 +694,17 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         Worker worker= publicService.getInstallOrderWorker(item.getWxrenid());
         if (worker !=null){
             // 提取网点师傅ID
-            WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),oldOrder.getWebsitId());
+            /*WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),oldOrder.getWebsitId());
             if (ww !=null ){
                 oldOrder.setWorkerId(ww.getWebsitWorkerId());
                 oldOrder.setWorkerName(worker.getWorkerName());
                 oldOrder.setWorkerMobile(worker.getMobile());
                 oldOrder.setWorkerIdcard(worker.getIdcard());
-            }
+            }*/
+            oldOrder.setWorkerId(worker.getWorkerId());
+            oldOrder.setWorkerName(worker.getWorkerName());
+            oldOrder.setWorkerMobile(worker.getMobile());
+            oldOrder.setWorkerIdcard(worker.getIdcard());
         }
 
         // 3：用户期望上门时间信息更新
@@ -2836,13 +2840,17 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         Worker worker= publicService.getInstallOrderWorker(item.getWxrenid());
         if (worker !=null){
             // 提取网点师傅ID
-            WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),order.getWebsitId());
+            /*WebsitWorker ww = publicService.getOrderWebsitWorker(worker.getWorkerId(),order.getWebsitId());
             if (ww !=null ){
                 order.setWorkerId(ww.getWebsitWorkerId());
                 order.setWorkerName(worker.getWorkerName());
                 order.setWorkerMobile(worker.getMobile());
                 order.setWorkerIdcard(worker.getIdcard());
-            }
+            }*/
+            order.setWorkerId(worker.getWorkerId());
+            order.setWorkerName(worker.getWorkerName());
+            order.setWorkerMobile(worker.getMobile());
+            order.setWorkerIdcard(worker.getIdcard());
         }
 
         // 新增

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

@@ -164,7 +164,8 @@ public class MasterDownloadServiceImpl implements MasterDownloadService {
 
 		//  清除 维修故障现象表、维修项目表
 		processDelete(brandRec);
-		// 处理空调
+
+		// 处理空调 维修－产品故障基表下载记录 itf_tbl_wx_cpgz_download
 		// 生成故障现象数据(repair_bug) 故障现象类型为家用空调及商用空调，通用的分两部分家用与商用 1-2
 		// 进行了大小类处理，但同步过来的数据并无大小类数据     OK
 		addItfTblWxCpgzDownloadOld(synTaskNo, brandRec);

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

@@ -401,7 +401,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         recs = getWorkerUploads(1);
 
         // 测试用
-        // recs = getWorkerUploadstest();
+        recs = getWorkerUploadstest();
 
         for (OutWorkerUpload item:recs){
             try{
@@ -475,7 +475,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                     if (response.getStatus() == 200){
                         // 获取网点签约的品类信息
                         websitqypl = JSONObject.parseObject(response.getData().toString(), WebsitQXLB.class);
-                        // log.info("总部网点签约的品类信息{}-{}",dot.getBrandWebsitId(),JSONObject.toJSONString(websitqypl));
+                        log.info("总部网点签约的品类信息{}-{}",dot.getBrandWebsitId(),JSONObject.toJSONString(websitqypl));
                     } else {
                         // 写入表备注信息
                         updateWorkerUploadLag(item,"获取网点签约的品类信息失败["+
@@ -484,9 +484,9 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                         continue;
                     }
 
-                    /*log.info("平台师傅签约的品类信息[{}-{}] 家用:{} 商用：{}",
+                    log.info("平台师傅签约的品类信息[{}-{}] 家用:{} 商用：{}",
                             worker.getWorkerId(),dot.getWebsitId(),
-                            JSONObject.toJSONString(jySignSplbList),JSONObject.toJSONString(sySignSplbList));*/
+                            JSONObject.toJSONString(jySignSplbList),JSONObject.toJSONString(sySignSplbList));
 
                     // 从网点签约的品类信息中过滤师傅的品类信息
                     String result = extracted(jySignSplbList, sySignSplbList, jyList, syList, websitqypl,dot.getBrandWebsitId());

src/main/resources/bootstrap-prdt.properties

@@ -304,7 +304,7 @@ workercertificatec=FALSE
 workerceruploadc=FALSE
 detaildownc=FALSE
 workercertbxc=FALSE
-workerrzc=TRUE
+workerrzc=FALSE
 inbeforec=FALSE
 workerfacec=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
@@ -415,7 +415,7 @@ hsgdcjtmc=FALSE
 datauploadc=FALSE
 #安装、维修工单入本地表
 installinc=FALSE
-repairinc=FALSE
+repairinc=TRUE
 smsinselfc=FALSE
 #完工评价短信格力总部发送，自建工单联通发送，查看评价短信回复信息，自建完工评价短信联通发送，派服务人员格力发送
 wgmsgsendc=FALSE