add

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

@@ -165,7 +165,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                         ItfTblWangdianWxgDownload::getWxgmc,
                         ItfTblWangdianWxgDownload::getYddh,
                         ItfTblWangdianWxgDownload::getFlag)
-                .eq(ItfTblWangdianWxgDownload::getSfzen,"430422198107105010")// 测试用
+                // .eq(ItfTblWangdianWxgDownload::getSfzen,"430422198107105010")// 测试用
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
         // 提取现有已存在的证件信息的师傅信息(待回传同步的证件不处理)
@@ -445,7 +445,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
         websitWorkers = websitWorkerService.lambdaQuery()
                 .eq(WebsitWorker::getOutZjljProcess,0)
-                .in(WebsitWorker::getWebsitWorkerId,"1696842046686597122","1696842046724345857","1698942353616801794")// 测试用
+                // .in(WebsitWorker::getWebsitWorkerId,"1696842046686597122","1696842046724345857","1698942353616801794")// 测试用
                 .isNotNull(WebsitWorker::getOutZjlj).list();
 
         for (WebsitWorker item :websitWorkers){
@@ -1424,17 +1424,24 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         MyBeanUtils.copyProperties(w,upwwinfo);
 
 
+        upwwinfo.setInsureStatus(0);
+
         // 有效期
         if (StringUtils.isNotEmpty(zj.getZjyxq())){
             upwwinfo.setInsureStartTime(publicService.subOneYear(baseService.utcToDateStr(zj.getZjyxq())));
             upwwinfo.setGmbxyxq(baseService.utcToDateStr(zj.getZjyxq()));
+            Date n = new Date();
+            if ((upwwinfo.getInsureStartTime().compareTo(n)<=0) &&
+                    (upwwinfo.getGmbxyxq().compareTo(n)>=0)){
+                upwwinfo.setInsureStatus(2);
+            }
         }
-        upwwinfo.setInsureStatus(2);
+
         // 保险公司及编号
         if (zj.getZjbh().contains("/")){
             List<String> result = Arrays.asList(zj.getZjbh().split("/"));
             upwwinfo.setSafeCompany(result.get(0));
-            upwwinfo.setInsureName(result.get(0));
+            upwwinfo.setInsureName("意外险");
             upwwinfo.setSafeNo(result.get(1));
         } else {
             upwwinfo.setSafeNo(zj.getZjbh());

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

@@ -189,7 +189,7 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                         .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
 
-                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,660) // 测试用
+                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,989L) // 测试用
                         // .eq(OutJiasmToGreeUploadTaskList::getOrderNo,"A1691659257781723138") // 测试用
                         // .eq(OutJiasmToGreeUploadTaskList::getTableName,"order_base") // 测试用
 

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

@@ -1400,13 +1400,15 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 for (OrderDetailFile f:detailFiles){
                     // 条码类型相同，采集图与上传图同步
                     if (code.getType().equals(String.valueOf(f.getFileType())) &&
-                            (!code.getPath().equals(f.getFilePath()) || !code.getGreeImageId().equals(f.getBrandFilePath()))){
+                            code.getSortNum().equals(f.getSortNum()) &&
+                    (!code.getPath().equals(f.getFilePath()) || !code.getGreeImageId().equals(f.getBrandFilePath()))){
                         code.setPath(f.getFilePath());
                         code.setGreeImageId(f.getBrandFilePath());
                         ucodes.add(code);
                     }
                     // 条码类型相同，采集图与上传图同步 管理端外机条码为3
                     if (code.getType().equals(String.valueOf(f.getFileType()-1)) &&
+                            code.getSortNum().equals(f.getSortNum()) &&
                             (!code.getPath().equals(f.getFilePath()) || !code.getGreeImageId().equals(f.getBrandFilePath()))){
                         code.setPath(f.getFilePath());
                         code.setGreeImageId(f.getBrandFilePath());

src/main/resources/bootstrap-dev.properties

@@ -298,7 +298,7 @@ pgmsgsend=5000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
 workercertificatec=FALSE
-workerceruploadc=TRUE
+workerceruploadc=FALSE
 detaildownc=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
@@ -389,7 +389,7 @@ glscc=FALSE
 #天猫商城
 tmscc=FALSE
 #安装工单上传  生成需要上传的数据、生成上传任务清单列表
-azuploadyscc=FALSE
+azuploadyscc=TRUE
 azuploadscc=FALSE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
 wxuploadyscc=FALSE