add

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

@@ -240,7 +240,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
         workerCertList = workerCertService.lambdaQuery()
                 .eq(WorkerCert::getOutZjljProcess,0)
-                // .eq(WorkerCert::getWorkerId,"1696834689558614018")// 测试用
+                .eq(WorkerCert::getWorkerId,"1696834689558614018")// 测试用
                 .isNotNull(WorkerCert::getOutZjlj).list();
 
         for (WorkerCert item :workerCertList){
@@ -842,28 +842,44 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
     private void processCertInfo(WorkerCert workerCert) throws Exception {
         if (workerCert.getOutZjlj().contains(",")){
+            Boolean flag = Boolean.TRUE;
             List<String> result = Arrays.asList(workerCert.getOutZjlj().split(","));
             // 上传图片
-            if (StringUtils.isNotEmpty(result.get(0))){
+            if (StringUtils.isNotEmpty(result.get(0)) && StringUtils.isEmpty(workerCert.getFileUrl())){
                 String id = putCert(result.get(0));
-                workerCert.setFileUrl(id);
-                workerCert.setOutFileUrl(result.get(0));
-                new File(id).delete();
+                if (StringUtils.isNotEmpty(id)){
+                    workerCert.setFileUrl(id);
+                    workerCert.setOutFileUrl(result.get(0));
+                    new File(id).delete();
+                } else {
+                    flag = Boolean.FALSE;
+                }
             }
-            if (StringUtils.isNotEmpty(result.get(1))){
+            if (StringUtils.isNotEmpty(result.get(1)) && StringUtils.isEmpty(workerCert.getFileUrl2())){
                 String id2 = putCert(result.get(1));
-                workerCert.setFileUrl2(id2);
-                workerCert.setOutFileUrl2(result.get(1));
+                if (StringUtils.isNotEmpty(id2)){
+                    workerCert.setFileUrl2(id2);
+                    workerCert.setOutFileUrl2(result.get(1));
+                    new File(id2).delete();
+                } else {
+                    flag = Boolean.FALSE;
+                }
+            }
+
+            if (flag){
                 workerCert.setOutZjljProcess(1);
-                new File(id2).delete();
             }
+            workerCert.setOutSyncTime(new Date());
         } else {
             if (StringUtils.isNotEmpty(workerCert.getOutZjlj())){
                 String id = putCert(workerCert.getOutZjlj());
-                workerCert.setFileUrl(id);
-                workerCert.setOutFileUrl(workerCert.getOutZjlj());
-                workerCert.setOutZjljProcess(1);
-                new File(id).delete();
+                if (StringUtils.isNotEmpty(id)){
+                    workerCert.setFileUrl(id);
+                    workerCert.setOutFileUrl(workerCert.getOutZjlj());
+                    workerCert.setOutZjljProcess(1);
+                    workerCert.setOutSyncTime(new Date());
+                    new File(id).delete();
+                }
             }
         }
     }
@@ -871,9 +887,13 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     private void processBxInfo(InsureWorkerCommercialFile iwcfile) throws IOException {
         if (StringUtils.isNotEmpty(iwcfile.getOutZjlj())){
             String id = putCert(iwcfile.getOutZjlj());
-            iwcfile.setFileUrl(id);
-            iwcfile.setOutZjljProcess(1);
-            new File(id).delete();
+            if (StringUtils.isNotEmpty(id)){
+                iwcfile.setFileUrl(id);
+                iwcfile.setOutZjljProcess(1);
+                iwcfile.setCreateTime(new Date());
+                new File(id).delete();
+            }
+
         }
     }
 
@@ -1085,6 +1105,18 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
     private void getInsureWorkerCommercialFile(List<InsureWorkerCommercialFile> insurefiles, ZJInfo zj, InsureWorkerCommercial a) {
         List<String> zjs = new ArrayList<>();
+        if (StringUtils.isEmpty(zj.getZjlj())){
+            InsureWorkerCommercialFile icf = new InsureWorkerCommercialFile();
+            icf.setId(IdWorker.getIdStr());
+            icf.setInsureWorkerCommercialId(a.getId());
+            icf.setCreateBy("system");
+            icf.setCreateTime(new Date());
+            icf.setOutZjlj("");
+            icf.setOutZjljProcess(-1);
+            insurefiles.add(icf);
+            return;
+        }
+
         if (zj.getZjlj().contains(",")){
             zjs = Arrays.asList(zj.getZjlj().split(","));
         } else {