add

src/main/java/com/zfire/jiasm/syncdata/service/PublicService.java

@@ -171,5 +171,5 @@ public interface PublicService {
     void setKjmm(ItfTblAzWgmxJyktUpload mxup);
     void setSyktKjmm(ItfTblAzWgmxSyktUpload mxup);
     void setQitaKjmm(ItfTblAzWgmxQitaUpload mxup);
-    Integer setfjType(Integer type);
+    Integer setfjType(Integer type,OrderInstallDetail detailone);
 }

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

@@ -671,7 +671,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             ItfTblAzWgmxJyktFjUpload jyktfj = fileOrderDetailMapper.getFileUpload(request);
             if (jyktfj !=null){
                 // 修改类型对应关系
-                jyktfj.setType(publicService.setfjType(jyktfj.getType()));
+                jyktfj.setType(publicService.setfjType(jyktfj.getType(),detailone));
                 itfTblAzWgmxJyktFjUploadService.save(jyktfj);
             }
         } else if (mainName.equals("商用空调")){
@@ -679,7 +679,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             ItfTblAzWgmxSyktFjUpload syktfj = fileOrderDetailMapper.getSyFileUpload(request);
             if (syktfj !=null){
                 // 修改类型对应关系
-                syktfj.setType(publicService.setfjType(syktfj.getType()));
+                syktfj.setType(publicService.setfjType(syktfj.getType(),detailone));
                 itfTblAzWgmxSyktFjUploadService.save(syktfj);
             }
         } else {
@@ -687,7 +687,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             ItfTblAzWgmxQitaFjUpload otherfj = fileOrderDetailMapper.getOtherFileUpload(request);
             if (otherfj != null){
                 // 修改类型对应关系
-                otherfj.setType(publicService.setfjType(otherfj.getType()));
+                otherfj.setType(publicService.setfjType(otherfj.getType(),detailone));
                 itfTblAzWgmxQitaFjUploadService.save(otherfj);
             }
         }
@@ -1699,7 +1699,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             ItfTblAzWgmxJyktFjUpload jyktfj = fileOrderDetailMapper.getFileUploadCJ(request);
             if (jyktfj !=null){
                 // 修改类型对应关系
-                jyktfj.setType(publicService.setfjType(jyktfj.getType()));
+                jyktfj.setType(publicService.setfjType(jyktfj.getType(),detailone));
                 if (!itfTblAzWgmxJyktFjUploadService.save(jyktfj)){
                     return Boolean.FALSE;
                 }
@@ -1713,7 +1713,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             ItfTblAzWgmxSyktFjUpload syktfj = fileOrderDetailMapper.getSyFileUploadCj(request);
             if (syktfj !=null){
                 // 修改类型对应关系
-                syktfj.setType(publicService.setfjType(syktfj.getType()));
+                syktfj.setType(publicService.setfjType(syktfj.getType(),detailone));
                 if (!itfTblAzWgmxSyktFjUploadService.save(syktfj)){
                     return Boolean.FALSE;
                 }
@@ -1727,7 +1727,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             ItfTblAzWgmxQitaFjUpload otherfj = fileOrderDetailMapper.getOtherFileUploadCj(request);
             if (otherfj != null){
                 // 修改类型对应关系
-                otherfj.setType(publicService.setfjType(otherfj.getType()));
+                otherfj.setType(publicService.setfjType(otherfj.getType(),detailone));
                 if (!itfTblAzWgmxQitaFjUploadService.save(otherfj)){
                     return Boolean.FALSE;
                 }

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

@@ -1957,7 +1957,7 @@ public class PublicServiceImpl implements PublicService {
     }
 
     @Override
-    public Integer setfjType(Integer type){
+    public Integer setfjType(Integer type,OrderInstallDetail detailone){
         Integer result = type;
         switch (type){
             case 1:
@@ -2020,6 +2020,15 @@ public class PublicServiceImpl implements PublicService {
                 result = 4;
                 break;
         }
+        // 类型:ALL=一体机,INSIDE=内机,OUT=外机,INSIDE_OUT=一内一外
+        if (type == 42){
+            if (detailone.getType().equals("INSIDE") || detailone.getType().equals("INSIDE_OUT")){
+                result = 4;
+            } else if (detailone.getType().equals("OUT") || detailone.getType().equals("ALL")){
+                result = 5;
+            }
+        }
+
         return result;
     }
 

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

@@ -401,7 +401,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         recs = getWorkerUploads(1);
 
         // 测试用
-        // recs = getWorkerUploadstest();
+        recs = getWorkerUploadstest();
 
         for (OutWorkerUpload item:recs){
             try{
@@ -475,7 +475,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                     if (response.getStatus() == 200){
                         // 获取网点签约的品类信息
                         websitqypl = JSONObject.parseObject(response.getData().toString(), WebsitQXLB.class);
-                        log.info("总部网点签约的品类信息{}-{}",dot.getBrandWebsitId(),JSONObject.toJSONString(websitqypl));
+                        // log.info("总部网点签约的品类信息{}-{}",dot.getBrandWebsitId(),JSONObject.toJSONString(websitqypl));
                     } else {
                         // 写入表备注信息
                         updateWorkerUploadLag(item,"获取网点签约的品类信息失败["+
@@ -518,7 +518,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                     req.setWdno(dot.getBrandWebsitId());
 
                     // 日志
-                    // log.info("创建或修改师傅信息request：{}",JSONObject.toJSONString(req));
+                    log.info("创建或修改师傅信息request：{}",JSONObject.toJSONString(req));
 
                     // 同步
                     syncData(dot.getId(), wxgaddapi, item, req,dot.getBrandWebsitId());
@@ -2150,7 +2150,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
     private List<OutWorkerUpload> getWorkerUploadstest() {
         // 同步标志-synStatus(0:待同步;1:已同步;99:同步失败)
         List<OutWorkerUpload> recs = outWorkerUploadService.lambdaQuery()
-                .eq(OutWorkerUpload::getSynReqId,147).list();
+                .eq(OutWorkerUpload::getSynReqId,176).list();
         return recs;
     }
 }

src/main/resources/bootstrap-prdt.properties

@@ -303,7 +303,7 @@ workercertificatec=FALSE
 workerceruploadc=FALSE
 detaildownc=FALSE
 workercertbxc=FALSE
-workerrzc=FALSE
+workerrzc=TRUE
 inbeforec=FALSE
 workerfacec=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
@@ -399,7 +399,7 @@ glscc=FALSE
 tmscc=FALSE
 #安装工单上传  生成需要上传的数据、生成上传任务清单列表
 azuploadyscc=FALSE
-azuploadscc=TRUE
+azuploadscc=FALSE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
 wxuploadyscc=FALSE
 wxuploadscc=FALSE