yaozhixue 1 年間 前
コミット
c583772915

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

@@ -251,8 +251,9 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
             awc.setCertFlag(1);
         } else if ("保险证".equals(certName)) {
             awc.setCertFlag(2);
-        } else if ("高空证".equals(certName)) {
+        } else if ("高空作业证".equals(certName) || "高空证".equals(certName)) {
             awc.setCertFlag(3);
+            awc.setCertName("高空作业证");
         } else if ("上岗证".equals(certName)) {
             awc.setCertFlag(4);
         } else if ("制冷证".equals(certName)) {

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

@@ -114,6 +114,9 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         // 获取待同步数据
         recs = getWorkerUploads();
 
+        // 测试用
+        // recs = getWorkerUploadstest();
+
         for (OutWorkerUpload item:recs){
             try{
                 WorkUploadInfo req = new WorkUploadInfo();
@@ -705,7 +708,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
 
     // true为有信息
     private Boolean getgkzBak(WorkerCertificateInfo workerCertificateInfo, String workerId) throws ParseException {
-        WorkerCert certificate = getCertificateInfo(workerId,"高空证");
+        WorkerCert certificate = getCertificateInfo(workerId,"高空作业证");
         // 无证件不处理
         if (certificate == null){
             return Boolean.TRUE;
@@ -736,7 +739,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         WorkerCertGree wcg = null;
 
         for (WorkerCertGree item :wcgs){
-            if ("高空证".equals(item.getCertName())){
+            if ("高空作业证".equals(item.getCertName())){
                 wcg= item;
                 break;
             }
@@ -1541,4 +1544,12 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         recs = outWorkerUploadService.list(queryWrapper);
         return recs;
     }
+
+
+    private List<OutWorkerUpload> getWorkerUploadstest() {
+        // 同步标志-synStatus(0:待同步;1:已同步;99:同步失败)
+        List<OutWorkerUpload> recs = outWorkerUploadService.lambdaQuery()
+                .eq(OutWorkerUpload::getSynReqId,1).list();
+        return recs;
+    }
 }

+ 2 - 2
src/main/resources/bootstrap-prdt.properties

@@ -294,8 +294,8 @@ greesms=10000
 SMSSelf_marketing_Rate=5000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
-workercertificatec=TRUE
-workerceruploadc=FALSE
+workercertificatec=FALSE
+workerceruploadc=TRUE
 detaildownc=FALSE
 workercertbxc=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表