add

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

@@ -302,7 +302,12 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
 
         // 若未同步生成三方文件不处理，等待其他定时任务处理 processUploadTask
         if (StringUtils.isEmpty(item.getOutInsureCert())){
-            updateOutWorkerUploadError(owu,"等待同步保险信息");
+            if (StringUtils.isEmpty(item.getInsureFiles())){
+                updateOutWorkerUploadError(owu,"师傅未购买保险【"+owu.getWebsitId() + "】");
+            } else {
+                updateOutWorkerUploadError(owu,"等待同步保险信息");
+            }
+
             return Boolean.FALSE;
         }
 

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

@@ -2013,7 +2013,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
     private List<OutWorkerUpload> getWorkerUploadstest() {
         // 同步标志-synStatus(0:待同步;1:已同步;99:同步失败)
         List<OutWorkerUpload> recs = outWorkerUploadService.lambdaQuery()
-                .eq(OutWorkerUpload::getSynReqId,37).list();
+                .eq(OutWorkerUpload::getSynReqId,125).list();
         return recs;
     }
 }

src/main/java/com/zfire/jiasm/syncdata/upload/worker/UploadWorkerTOGree.java

@@ -31,6 +31,8 @@ public class UploadWorkerTOGree {
     private String workerceruploadc = "";
     @Value("${workerrzc}")
     private String workerrzc = "";
+    @Value("${inbeforec}")
+    private String inbeforec = "";
 
     @Autowired
     UploadWorkerTOGreeService uploadWorkerTOGreeService;
@@ -57,10 +59,10 @@ public class UploadWorkerTOGree {
     }
 
     // 师傅入驻格力新网点前 同步证件数据(保险+其他证件照)
-    @Scheduled(fixedDelayString = "${workercerupload}")
+    @Scheduled(fixedDelayString = "${inbefore}")
     public void workAddCertProcess() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        if (workerceruploadc.equals(TaskConfigEnum.FALSE.getCode())){
+        if (inbeforec.equals(TaskConfigEnum.FALSE.getCode())){
             return;
         }
 
@@ -74,7 +76,7 @@ public class UploadWorkerTOGree {
 
 
     // 师傅入驻格力新网点
-    @Scheduled(fixedDelayString = "${workercerupload}")
+    @Scheduled(fixedDelayString = "${workerrz}")
     public void workAddProcess() throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if (workerrzc.equals(TaskConfigEnum.FALSE.getCode())){

src/main/resources/bootstrap-dev.properties

@@ -182,6 +182,8 @@ workercertificate=60000
 workercerupload=5000
 detaildown=2000
 workercertbx=60000
+inbefore=60000
+workerrz=60000
 #安装工单下载 、入本地表
 installdown=2000
 installin=5000
@@ -309,6 +311,7 @@ workerceruploadc=FALSE
 detaildownc=FALSE
 workercertbxc=FALSE
 workerrzc=FALSE
+inbeforec=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
 recyclefkdownc=FALSE

src/main/resources/bootstrap-prd.properties

@@ -173,6 +173,8 @@ workercertificate=60000
 workercerupload=60000
 detaildown=2000
 workercertbx=60000
+inbefore=60000
+workerrz=60000
 #安装工单下载 、入本地表
 installdown=2000
 installin=5000
@@ -300,6 +302,7 @@ workerceruploadc=TRUE
 detaildownc=TRUE
 workercertbxc=TRUE
 workerrzc=TRUE
+inbeforec=TRUE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=TRUE
 recyclefkdownc=TRUE

src/main/resources/bootstrap-prdt.properties

@@ -173,6 +173,8 @@ workercertificate=60000
 workercerupload=5000
 detaildown=2000
 workercertbx=60000
+inbefore=60000
+workerrz=60000
 #安装工单下载 、入本地表
 installdown=2000
 installin=5000
@@ -296,10 +298,11 @@ SMSSelf_marketing_Rate=5000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
 workercertificatec=FALSE
-workerceruploadc=TRUE
+workerceruploadc=FALSE
 detaildownc=FALSE
 workercertbxc=FALSE
 workerrzc=FALSE
+inbeforec=TRUE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
 recyclefkdownc=FALSE

src/main/resources/bootstrap-test.properties

@@ -181,6 +181,8 @@ workercertificate=60000
 workercerupload=60000
 detaildown=60000
 workercertbx=60000
+inbefore=60000
+workerrz=60000
 #安装工单下载 、入本地表
 installdown=2000
 installin=5000
@@ -308,6 +310,7 @@ workerceruploadc=TRUE
 detaildownc=TRUE
 workercertbxc=TRUE
 workerrzc=FALSE
+inbeforec=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=TRUE
 recyclefkdownc=TRUE