add

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

@@ -111,11 +111,11 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             oldWorkerRec.clear();
         }
 
-        List<WebsitWorker> wws = websitWorkerService.lambdaQuery().list();
+        /*List<WebsitWorker> wws = websitWorkerService.lambdaQuery().list();
         if (CollectionUtils.isNotEmpty(wws)){
             websitWorkerWorkerIdMap = wws.stream().collect(Collectors.groupingBy(WebsitWorker::getWorkerId));
             wws.clear();
-        }
+        }*/
 
         // 提取格力现有的网点师傅数据信息
         wxgDownladRecs =  itfTblWangdianWxgDownloadService.lambdaQuery()
@@ -130,12 +130,12 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
         // 提取现有已存在的证件信息的师傅信息(待回传同步的证件不处理)
-        List<WorkerCert> wc = workerCertService.lambdaQuery()
+        /*List<WorkerCert> wc = workerCertService.lambdaQuery()
                 .eq(WorkerCert::getOutSyncStatus,1).list();
         if (CollectionUtils.isNotEmpty(wc)){
             WorkerCertWorkerIdMaps = wc.stream().collect(Collectors.groupingBy(WorkerCert::getWorkerId));
             wc.clear();
-        }
+        }*/
 
 
         for (ItfTblWangdianWxgDownload wxg :wxgDownladRecs){
@@ -152,6 +152,22 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 continue;
             }
 
+            // 提取该师傅的证件信息的师傅信息(待回传同步的证件不处理)
+            List<WorkerCert> wc = workerCertService.lambdaQuery()
+                    .eq(WorkerCert::getWorkerId,workerId)
+                    .eq(WorkerCert::getOutSyncStatus,1).list();
+            if (CollectionUtils.isNotEmpty(wc)){
+                WorkerCertWorkerIdMaps = wc.stream().collect(Collectors.groupingBy(WorkerCert::getWorkerId));
+                wc.clear();
+            }
+
+            List<WebsitWorker> wws = websitWorkerService.lambdaQuery()
+                    .eq(WebsitWorker::getWorkerId,workerId).list();
+            if (CollectionUtils.isNotEmpty(wws)){
+                websitWorkerWorkerIdMap = wws.stream().collect(Collectors.groupingBy(WebsitWorker::getWorkerId));
+                wws.clear();
+            }
+
             // 有证件信息的师傅不再新增
             /*if (WorkerCertWorkerIdMaps.containsKey(workerId)){
                 continue;
@@ -708,7 +724,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         }
 
         if (zj.getZjlj().contains(",")){
-            log.info("两个");
             List<String> result = Arrays.asList(zj.getZjlj().split(","));
             // 上传图片
             String id = putCert(result.get(0));
@@ -725,7 +740,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             new File(id).delete();
             new File(id2).delete();
         } else {
-            log.info("一个");
             String id = putCert(zj.getZjlj());
             if (StringUtils.isNotEmpty(id)){
                 add.setFileUrl(id);
@@ -733,7 +747,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
             }
             new File(id).delete();
         }
-        log.info("添加 ：{}",JSONObject.toJSONString(add));
         addList.add(add);
     }
 
@@ -776,9 +789,8 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                     continue;
                 }
                 workerBXAdd(bx, websitWorkerUp);
-                // continue; 先测试下
+                continue;
             }
-
             // 校验证件是否需要新增同步
             ZJInfoC addZj =checkCertInfo(workerId,WorkerCertWorkerIdMaps,zj);
             if (addZj.getZjInfo()!=null){