yaozhixue 1 year ago
parent
commit
414d23203f

+ 27 - 1
src/main/java/com/zfire/jiasm/syncdata/service/impl/UploadWorkerTOGreeServiceImpl.java

@@ -127,7 +127,9 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                 WorkerCertificateInfo workerCertificateInfo = new WorkerCertificateInfo();
                 WorkerCertificateInfo workerCertificateInfo = new WorkerCertificateInfo();
 
 
                 // 看要同步的师傅的证件上否已全部更新 只有全部更新才可以执行
                 // 看要同步的师傅的证件上否已全部更新 只有全部更新才可以执行
-
+                if (checkWaitCert(item)){
+                    continue;
+                }
 
 
                 // 获取师傅信息  需要同步的师傅必须在平台系统中存在
                 // 获取师傅信息  需要同步的师傅必须在平台系统中存在
                 if (!workersMap.containsKey(item.getWorkerId())){
                 if (!workersMap.containsKey(item.getWorkerId())){
@@ -268,6 +270,30 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         }
         }
     }
     }
 
 
+    private boolean checkWaitCert(OutWorkerUpload item) {
+        //先看保险
+        WebsitWorker wws = websitWorkerService.lambdaQuery()
+                .eq(WebsitWorker::getWorkerId, item.getWorkerId())
+                .eq(WebsitWorker::getWebsitId, item.getWebsitId()).one();
+        // 若未更新保险不同步
+        if (wws != null) {
+            if (StringUtils.isEmpty(wws.getOutInsureCert())){
+                return true;
+            }
+        }
+        // 看其他证件有未同步更新
+        List<WorkerCert> workerwcs = workerCertService.lambdaQuery()
+                .eq(WorkerCert::getWorkerId, item.getWorkerId())
+                .list();
+        for (WorkerCert w : workerwcs){
+            if ((StringUtils.isNotEmpty(w.getFileUrl()) && (StringUtils.isEmpty(w.getOutFileUrl()))) ||
+                    (StringUtils.isNotEmpty(w.getFileUrl2()) && (StringUtils.isEmpty(w.getOutFileUrl2())))){
+                continue;
+            }
+        }
+        return false;
+    }
+
     @Override
     @Override
     public void procesAddCertWorker(){
     public void procesAddCertWorker(){
         List<OutWorkerUpload> recs = new ArrayList<>();
         List<OutWorkerUpload> recs = new ArrayList<>();