add

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

@@ -87,7 +87,7 @@ public class InstallBusinessApi {
 
         // 测试使用
         /*lcls = itfTblAzAssignLcLsDownloadService.lambdaQuery()
-                .eq(ItfTblAzAssignLcLsDownload::getSynReqId,173039L)
+                .eq(ItfTblAzAssignLcLsDownload::getSynReqId,193181L)
                 .list();*/
 
 

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

@@ -146,7 +146,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 				+ " c.download_task_type_name "
 				+ " FROM itf_gree_to_fa_download_task_list a,itf_gree_to_fa_download_task_type c "
 				+ " where a.download_task_type=c.download_task_type "
-				+ " and a.download_key_value='8aaaa2d38a983600018a9c85c4940d9e' ");
+				+ " and a.download_key_value='B205E9EFB725E4E10268BB80DACF38E5' ");
 		return result;
 	}
 	

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

@@ -689,11 +689,13 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         sfzens.add(m.getSfzen() + m.getWxgmc().trim() + m.getYddh());
     }
 
-    private Worker addWorkerInfo(ItfTblWangdianWxgDownload m,Boolean flag) {
+    private Worker addWorkerInfo(ItfTblWangdianWxgDownload m,Boolean flag, String workerId) {
         Worker v = new Worker();
         //  S + 手机号
         // v.setWorkerId(IdWorker.getIdStr());
-        v.setWorkerId("S" + m.getYddh());
+        // v.setWorkerId("S" + m.getYddh());
+        v.setWorkerId("W" + workerId);
+
 
         v.setWorkerName(m.getWxgmc().trim());
         v.setFirstWord(PinyinUtil.getPinyin(v.getWorkerName().substring(0,1)).substring(0,1).toUpperCase(Locale.ROOT));
@@ -975,6 +977,8 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         List<Worker> addWorkerRec = new ArrayList<>();
         List<Worker> uupWorkerRec = new ArrayList<>();
         Map<String,Worker> workerIdCardMap = new HashMap<>();
+        List<String> workdids = new ArrayList<>();
+        List<String> workdidsUp = new ArrayList<>();
 
         // 提取原有的信息
         List<Worker> oldWorkerRec =  workerService.lambdaQuery().list();
@@ -997,7 +1001,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
             */
 
             // 生成对象
-            Worker v = addWorkerInfo(m, flag);
+            Worker v = addWorkerInfo(m, flag,workdids.get(0));
 
             // 存在修改，不存在新增
             if (sfzens.contains(m.getSfzen().trim())){
@@ -1011,9 +1015,11 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
                 }
             } else {
                 // S + 手机号 作为ID主键，手机号是不能重的 不再新增，会报错主键冲突
-                if (mobiles.contains(m.getYddh().trim())){
+                /*if (mobiles.contains(m.getYddh().trim())){
                     continue;
-                }
+                }*/
+                workdidsUp.add(workdids.get(0));
+                workdids.remove(0);
                 sfzens.add(m.getSfzen().trim());
                 mobiles.add(m.getYddh().trim());
                 addWorkerRec.add(v);
@@ -1048,6 +1054,13 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
             log.info("本地网点维修工人员信息表修改了{}条数据", uupWorkerRec.size());
             uupWorkerRec.clear();
         }
+        
+        // 修改被使用状态
+        if (uupWorkerRec.size()>=500){
+            workerService.updateBatchById(uupWorkerRec);
+            log.info("本地网点维修工人员信息表修改了{}条数据", uupWorkerRec.size());
+            uupWorkerRec.clear();
+        }
 
         sfzens.clear();
         mobiles.clear();

src/main/resources/bootstrap-prdt.properties

@@ -413,12 +413,12 @@ hsgdcjtmc=FALSE
 #工单数据向上同步
 datauploadc=FALSE
 #安装、维修工单入本地表
-installinc=FALSE
+installinc=TRUE
 repairinc=FALSE
 #完工评价短信格力总部发送，自建工单联通发送，查看评价短信回复信息，自建完工评价短信联通发送，派服务人员格力发送
 wgmsgsendc=FALSE
 zjgdmsgsendc=FALSE
-qmsgsendc=TRUE
+qmsgsendc=FALSE
 zwgmsgsendc=FALSE
 pgmsgsendc=FALSE
 greesmsc=FALSE