yaozhixue 1 rok temu
rodzic
commit
e43eda5dcc

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

@@ -187,12 +187,12 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                     }
 
                 } else {
-                    log.info("同步获取总部网点师傅证件信息失败-师傅证件信息:{}", wxg.getSfzen());
+                    log.info("同步获取总部网点师傅证件信息失败a-师傅证件信息:{}", wxg.getSfzen());
                     log.info("msg:{}", response.getMsg());
                 }
             } catch (Exception ex) {
                 ex.printStackTrace();
-                log.info("同步获取总部网点师傅证件信息失败-师傅证件信息:{}", wxg.getSfzen());
+                log.info("同步获取总部网点师傅证件信息失败b-师傅证件信息:{}", wxg.getSfzen());
                 throw new Exception("同步获取总部网点师傅证件信息失败");
 
             }

+ 12 - 4
src/main/java/com/zfire/jiasm/syncdata/service/impl/UploadWorkeCertificateServiceImpl.java

@@ -345,13 +345,19 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
                 .eq(WorkerCertGree::getWorkerId,owu.getWorkerId())
                 .eq(WorkerCertGree::getBrandWebsitId,owu.getBrandWebsitId())
                 .list();
-        if (CollectionUtils.isNotEmpty(workerbx)){
-            // workerbxList=
+        if (CollectionUtils.isNotEmpty(workerbx)) {
+            workerbx.stream().forEach(even -> {
+                workerbxList.add(even.getBrandWebsitId() + even.getWorkerId() + even.getCertName());
+            });
+            workerbx.clear();
         }
 
-        // 若存在待同步的暂不处理
+
+
         for (WorkerCert item :recs){
             // 证件已同步无需再次同步或是更新
+
+            // 若存在待同步的暂不处理
             if ((StringUtils.isNotEmpty(item.getFileUrl()) && (StringUtils.isEmpty(item.getOutFileUrl()))) ||
                     (StringUtils.isNotEmpty(item.getFileUrl2()) && (StringUtils.isEmpty(item.getOutFileUrl2())))){
                 updateOutWorkerUploadError(owu,"等待同步证件信息");
@@ -360,7 +366,9 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
 
             // 查看证件数据是否已生成
             for (WorkerCertGree wcg : workerbx){
-                // if ()
+                if (workerbxList.contains(wcg.getBrandWebsitId() + wcg.getWorkerId() + wcg.getCertName())){
+
+                }
             }