yaozhixue 1 年之前
父节点
当前提交
dac114ae9c
共有 100 个文件被更改,包括 209 次插入153 次删除
  1. 二进制
      1674247610794930178.jpeg
  2. 二进制
      1674339773943808001.jpeg
  3. 二进制
      1674354905969225730.jpeg
  4. 二进制
      1674379833900679170.jpeg
  5. 二进制
      1674381271104155649.jpeg
  6. 二进制
      1674654640160530433.jpeg
  7. 0 1
      src/main/java/com/zfire/jiasm/syncdata/base/BaseService.java
  8. 6 5
      src/main/java/com/zfire/jiasm/syncdata/common/OldForNewUploadLogic.java
  9. 1 0
      src/main/java/com/zfire/jiasm/syncdata/download/basedata/MasterDownloadTask.java
  10. 56 25
      src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusiness.java
  11. 1 1
      src/main/java/com/zfire/jiasm/syncdata/download/order/RecycleDownload.java
  12. 44 32
      src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusiness.java
  13. 4 0
      src/main/java/com/zfire/jiasm/syncdata/gree/recycle/RecycleAcquisitionLogic.java
  14. 11 3
      src/main/java/com/zfire/jiasm/syncdata/gree/recycle/RecycleAssignLogic.java
  15. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFastEntryPlusTempController.java
  16. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFieldPlusTempController.java
  17. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModuleFavoritesPlusTempController.java
  18. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModulePlusTempController.java
  19. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminRolePlusTempController.java
  20. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserModuleRelaPlusTempController.java
  21. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserPlusTempController.java
  22. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserRoleRelaPlusTempController.java
  23. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitPlusTempController.java
  24. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitProductTypeRelaPlusTempController.java
  25. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitSlavePlusTempController.java
  26. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AreaPlusTempController.java
  27. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandLbsRelatePlusTempController.java
  28. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandPlusTempController.java
  29. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandWebsitPlusTempController.java
  30. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CityPlusTempController.java
  31. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailLogPlusTempController.java
  32. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailPlusTempController.java
  33. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComListPlusTempController.java
  34. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CommonFilePlusTempController.java
  35. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyCaAuthPlusTempController.java
  36. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyRecordManagePlusTempController.java
  37. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ContractTemplatePlusTempController.java
  38. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationCategoryPlusTempController.java
  39. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationPlusTempController.java
  40. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationWebsitPlusTempController.java
  41. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ImgCarouselManagePlusTempController.java
  42. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InstallChargeConfigPlusTempController.java
  43. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureAgreePlusTempController.java
  44. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailPlusTempController.java
  45. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailRecordPlusTempController.java
  46. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsurePlusTempController.java
  47. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureRangePlusTempController.java
  48. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialFilePlusTempController.java
  49. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialPlusTempController.java
  50. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerRecordPlusTempController.java
  51. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralDoublePlusTempController.java
  52. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeConfigurePlusTempController.java
  53. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeExplainPlusTempController.java
  54. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeSkillPlusTempController.java
  55. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralOffsetPlusTempController.java
  56. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralScorePlusTempController.java
  57. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralSkillLabelPlusTempController.java
  58. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralWorkerApplyPlusTempController.java
  59. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfGreeToFaDownloadTaskPlusTempController.java
  60. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignGzdmDowloadPlusTempController.java
  61. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXqxlDowloadPlusTempController.java
  62. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlbDowloadPlusTempController.java
  63. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlyDowloadPlusTempController.java
  64. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxqdDowloadPlusTempController.java
  65. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignYhsxWxDowloadPlusTempController.java
  66. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAzAssignXslxDowloadPlusTempController.java
  67. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityDownloadPlusTempController.java
  68. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityJdxzDownloadPlusTempController.java
  69. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCountyDownloadPlusTempController.java
  70. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblProvinceDownloadPlusTempController.java
  71. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbDaleiDownloadPlusTempController.java
  72. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbJixinDownloadPlusTempController.java
  73. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXiaoleiDownloadPlusTempController.java
  74. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXilieDownloadPlusTempController.java
  75. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblWangdianWxgDownloadPlusTempController.java
  76. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblXinWangdianDownloadPlusTempController.java
  77. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblYhsxViprankDowloadPlusTempController.java
  78. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelCurrencyPlusTempController.java
  79. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelPlusTempController.java
  80. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/LbsAmapPlusTempController.java
  81. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticePlusTempController.java
  82. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticeRecordPlusTempController.java
  83. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/OperationLogPlusTempController.java
  84. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductPlusTempController.java
  85. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductSeriesPlusTempController.java
  86. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProvincePlusTempController.java
  87. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/QualificationsManagePlusTempController.java
  88. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairBugPlusTempController.java
  89. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairProjectPlusTempController.java
  90. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SmsRecordPlusTempController.java
  91. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/StreetPlusTempController.java
  92. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictPlusTempController.java
  93. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictRefPlusTempController.java
  94. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictTypePlusTempController.java
  95. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ToolPlusTempController.java
  96. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/UserFeedbackPlusTempController.java
  97. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/UserPlusTempController.java
  98. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitEnclosureFilePlusTempController.java
  99. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitExamineRecordPlusTempController.java
  100. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitFilePlusTempController.java

二进制
1674247610794930178.jpeg


二进制
1674339773943808001.jpeg


二进制
1674354905969225730.jpeg


二进制
1674379833900679170.jpeg


二进制
1674381271104155649.jpeg


二进制
1674654640160530433.jpeg


+ 0 - 1
src/main/java/com/zfire/jiasm/syncdata/base/BaseService.java

@@ -75,7 +75,6 @@ public class BaseService {
         }
     }
 
-
     public String dateSub(Date d) {
         SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
         long localTime = d.getTime()-8*60*60*1000;

+ 6 - 5
src/main/java/com/zfire/jiasm/syncdata/common/OldForNewUploadLogic.java

@@ -724,9 +724,10 @@ public class OldForNewUploadLogic {
 		try {
 			JSONObject response = greeLogic.getPubV3(url, null);
 			if( 200 == response.getInteger("status").intValue()) {
-				List<ItfTblTradeNewForOldRejectJddDownload> tradeNewForOldRejectJddDownloadList = JSONArray.parseArray(this.mapper.writeValueAsString(response.get("data")),
+				List<ItfTblTradeNewForOldRejectJddDownload> newForOldList = JSONArray
+						.parseArray(this.mapper.writeValueAsString(response.get("data")),
 						ItfTblTradeNewForOldRejectJddDownload.class);
-				if(CollectionUtils.isNotEmpty(tradeNewForOldRejectJddDownloadList)) {
+				if(CollectionUtils.isNotEmpty(newForOldList)) {
 					Map<String,List<ItfTblTradeNewForOldRejectJddDownload>> jddsMap= new HashMap<>();
 					// 提取同步无批次号的数据
 					List<ItfTblTradeNewForOldRejectJddDownload> jdds = itfTblTradeNewForOldRejectJddDownloadService.lambdaQuery()
@@ -734,7 +735,7 @@ public class OldForNewUploadLogic {
 					if (CollectionUtils.isNotEmpty(jdds)){
 						jddsMap = jdds.stream().collect(Collectors.groupingBy(ItfTblTradeNewForOldRejectJddDownload::getPgguid));
 					}
-					for (ItfTblTradeNewForOldRejectJddDownload reject: tradeNewForOldRejectJddDownloadList){
+					for (ItfTblTradeNewForOldRejectJddDownload reject: newForOldList){
 						reject.setSynReqTime(new Date());
 						reject.setSynStatus(Constant.SynStatus.UN_SYN.getCode());
 						reject.setSynTimes(1);
@@ -747,9 +748,9 @@ public class OldForNewUploadLogic {
 							}
 						}
 					}
-					itfTblTradeNewForOldRejectJddDownloadService.saveOrUpdateBatch(tradeNewForOldRejectJddDownloadList);
+					itfTblTradeNewForOldRejectJddDownloadService.saveOrUpdateBatch(newForOldList);
 				}else {
-					log.info("TradeOldForNewLogic.queryRejectJdd接口返回记录数为空");
+					log.info("TradeOldForNewLogic.queryRejectJdd无驳回的签定单数据");
 				}
 			}else {
 				if(response.containsKey("messageCode") && null != response.get("messageCode")) {

+ 1 - 0
src/main/java/com/zfire/jiasm/syncdata/download/basedata/MasterDownloadTask.java

@@ -75,6 +75,7 @@ public class MasterDownloadTask {
                     .eq(ItfGreeToFaSynTaskList::getSynTaskType,9002)
                     .eq(ItfGreeToFaSynTaskList::getSynStatus,0).list();
 
+            // 数据落本地表
             for (ItfGreeToFaSynTaskList item : recs) {
                 int reqId =item.getId();
                 log.info("开始处理基础资料信息: \uF0B7{}",sdf.format(new Date()));

+ 56 - 25
src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusiness.java

@@ -160,6 +160,15 @@ public class InstallBusiness {
             } catch (Exception ex) {
                 ex.printStackTrace();
                 log.info("安装工单落本地表失败 销售单号-派工单号:【" + item.getXsdh() + "-"+ item.getPgid()+"】");
+                item.setSynErrMsg("落本地表失败");
+                if (StringUtils.isNotEmpty(ex.getMessage())){
+                    if (ex.getMessage().length()>1020){
+                        item.setSynErrMsg(ex.getMessage().substring(0,1020));
+                    } else {
+                        item.setSynErrMsg(ex.getMessage());
+                    }
+                }
+                itfTblAzAssignLcLsDownloadService.updateById(item);
             }
         }
 
@@ -205,7 +214,7 @@ public class InstallBusiness {
         newLCLS.setId(old.getId());
         newLCLS.setDispatchStatus(old.getDispatchStatus());
 
-        // 获取工单主表要同步的数据  upInfo 为null todo
+        // 获取工单主表要同步的数据  upInfo 为null
         OrderBase upInfo = getOrderBaseUp(old, item, newLCLS, brand);
 
         // 以旧换新数据下载同步表
@@ -473,6 +482,14 @@ public class InstallBusiness {
                 }
                 return null;
             }
+            // 工单师傅信息为空时用本地的师傅信息
+            if (newow==null){
+                newLCLS.setWorkerId(own.getWorkerId());
+                newLCLS.setWorkerName(own.getWorkerName());
+                newLCLS.setWorkerMobile(own.getWorkerMobile());
+                newLCLS.setWorkerIdcard(own.getWorkerIdcard());
+                return null;
+            }
 
             // 师傅信息变更,或是改派师傅
             if (!oow.getWorkerId().equals(newow.getWorkerId())) {
@@ -688,23 +705,26 @@ public class InstallBusiness {
         // pgmxid主键
         op.setPgmxid(mx.getPgmxid());
         op.setPgguid(mx.getPgguid());
-        op.setMainId(sysDictRefDLMap.get(String.valueOf(mx.getSpid())).get(0).getDictCode());
-        op.setMainName(sysDictRefDLMap.get(String.valueOf(mx.getSpid())).get(0).getDictValue());
-        if (!mx.getXlid().equals(0L)) {
+        op.setMainId(String.valueOf(mx.getSpid()));
+        op.setMainName(mx.getSpmc());
+        if (sysDictRefDLMap.containsKey(String.valueOf(mx.getSpid()))){
+            op.setMainId(sysDictRefDLMap.get(String.valueOf(mx.getSpid())).get(0).getDictCode());
+            op.setMainName(sysDictRefDLMap.get(String.valueOf(mx.getSpid())).get(0).getDictValue());
+        }
+
+        op.setSmallId(String.valueOf(mx.getXlid()));
+        op.setSmallName(mx.getXlmc());
+        if (!mx.getXlid().equals(0L) && sysDictRefXLMap.containsKey(String.valueOf(mx.getXlid()))) {
             op.setSmallId(sysDictRefXLMap.get(String.valueOf(mx.getXlid())).get(0).getDictCode());
             op.setSmallName(sysDictRefXLMap.get(String.valueOf(mx.getXlid())).get(0).getDictValue());
-        } else {
-            op.setSmallId(String.valueOf(mx.getXlid()));
-            op.setSmallName(mx.getXlmc());
         }
-
-        if (!mx.getXiid().equals("0")) {
+        op.setSeriesId(mx.getXiid());
+        op.setSeriesName(mx.getXimc());
+        if (!mx.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(mx.getXiid())) {
             op.setSeriesId(sysDictRefXiLieMap.get(mx.getXiid()).get(0).getDictCode());
             op.setSeriesName(sysDictRefXiLieMap.get(mx.getXiid()).get(0).getDictValue());
-        } else {
-            op.setSeriesId(mx.getXiid());
-            op.setSeriesName(mx.getXimc());
         }
+
         op.setProductId(mx.getJxno());
         op.setProductName(mx.getJxmc());
         op.setInsideCode(mx.getNjtm());
@@ -1741,9 +1761,12 @@ public class InstallBusiness {
         o.setNegativeRemark(s.getBmybeiz());
         o.setNegativeTime(s.getBmysj());
         // 产品大类
-        o.setMainId(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictCode());
-        o.setMainName(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictValue());
-
+        o.setMainId(String.valueOf(s.getSplb()));
+        o.setMainName("");
+        if (sysDictRefDLMap.containsKey(String.valueOf(s.getSplb()))){
+            o.setMainId(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictCode());
+            o.setMainName(sysDictRefDLMap.get(String.valueOf(s.getSplb())).get(0).getDictValue());
+        }
         o.setAppointmentType(s.getMydlx());
         o.setType(s.getSxlx());
         o.setCreateBy(s.getCreatedBy());
@@ -1914,23 +1937,26 @@ public class InstallBusiness {
         // pgmxid主键
         op.setPgmxid(mx.getPgmxid());
         op.setPgguid(mx.getPgguid());
-        op.setMainId(sysDictRefDLMap.get(String.valueOf(mx.getSpid())).get(0).getDictCode());
-        op.setMainName(sysDictRefDLMap.get(String.valueOf(mx.getSpid())).get(0).getDictValue());
-        if (!mx.getXlid().equals(0L)) {
+        op.setMainId(String.valueOf(mx.getSpid()));
+        op.setMainName(mx.getSpmc());
+        if (sysDictRefDLMap.containsKey(String.valueOf(mx.getSpid()))){
+            op.setMainId(sysDictRefDLMap.get(String.valueOf(mx.getSpid())).get(0).getDictCode());
+            op.setMainName(sysDictRefDLMap.get(String.valueOf(mx.getSpid())).get(0).getDictValue());
+        }
+        op.setSmallId(String.valueOf(mx.getXlid()));
+        op.setSmallName(mx.getXlmc());
+        if (!mx.getXlid().equals(0L) && sysDictRefXLMap.containsKey(String.valueOf(mx.getXlid()))) {
             op.setSmallId(sysDictRefXLMap.get(String.valueOf(mx.getXlid())).get(0).getDictCode());
             op.setSmallName(sysDictRefXLMap.get(String.valueOf(mx.getXlid())).get(0).getDictValue());
-        } else {
-            op.setSmallId(String.valueOf(mx.getXlid()));
-            op.setSmallName(mx.getXlmc());
         }
 
-        if (!mx.getXiid().equals("0")) {
+        op.setSeriesId(mx.getXiid());
+        op.setSeriesName(mx.getXimc());
+        if (!mx.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(mx.getXiid())) {
             op.setSeriesId(sysDictRefXiLieMap.get(mx.getXiid()).get(0).getDictCode());
             op.setSeriesName(sysDictRefXiLieMap.get(mx.getXiid()).get(0).getDictValue());
-        } else {
-            op.setSeriesId(mx.getXiid());
-            op.setSeriesName(mx.getXimc());
         }
+
         op.setProductId(mx.getJxno());
         op.setProductName(mx.getJxmc());
         op.setInsideCode(mx.getNjtm());
@@ -2083,6 +2109,11 @@ public class InstallBusiness {
         // 总部下来的工单新增时统一为待接收状态
         orderBase.setDispatchStatus("DJS");
 
+        // 1500 挂起工单  先给A13081=非广佛作废
+        if (item.getDqjd().equals(1500L)){
+            orderBase.setOrderStatus("A13081");
+        }
+
         //  预派工订单标识
         if (orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1100.getCode()) ||
                 orderBase.getOrderStatus().equals(OrderStatusEnum.INSTALL_STATUS_A1122.getCode()) ||

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/download/order/RecycleDownload.java

@@ -20,7 +20,7 @@ public class RecycleDownload {
     RecycleAcquisitionLogic recycleAcquisitionLogic;
 
 
-    /**
+    /** 未同步->已同步反馈明细->已同步采集数据->同步到业务表->已同步
      * 1:下载回收工单数据
      * 生成记录表数据、回收工单主表、回收工单反馈明细表、回收工单产品明细表 放到download表中(有则修改,无则插入,主键不同,只有插入)
      * 记录表中的任务号每条记录单独一个任务号;本次拉取数据批次号相同

+ 44 - 32
src/main/java/com/zfire/jiasm/syncdata/download/order/RepairBusiness.java

@@ -303,7 +303,7 @@ public class RepairBusiness {
                 oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G4.getCode())){
             // 大类存在,且相同 非商用
             if (StringUtils.isNotEmpty(oldOrder.getMainId()) && StringUtils.isNotEmpty(String.valueOf(item.getSpid())) &&
-                    !oldOrder.getMainId().equals(sysDictRefDLMap.get(String.valueOf(item.getSpid())).get(0).getDictCode()) &&
+                    !oldOrder.getMainId().equals(item.getSpid()) &&
                     (!item.getSpid().equals(DictTypeEnum.DICT_TYPE_SY_102.getCode())) &&
                     (!item.getSpid().equals(DictTypeEnum.DICT_TYPE_SY_109.getCode())) ){
                 List<OrderRepairOperatingLog> orlog = orderRepairOperatingLogService.lambdaQuery()
@@ -518,7 +518,7 @@ public class RepairBusiness {
         }
         // op.setMainId(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictCode());
         if (StringUtils.isNotEmpty(oldOrder.getMainId()) && StringUtils.isNotEmpty(String.valueOf(item.getSpid())) &&
-                !oldOrder.getMainId().equals(sysDictRefDLMap.get(String.valueOf(item.getSpid())).get(0).getDictCode())){
+                !oldOrder.getMainId().equals(item.getSpid())){
             flag = Boolean.TRUE;
         }
         return flag;
@@ -1257,22 +1257,22 @@ public class RepairBusiness {
         or.setYhif(item.getYhif());
         or.setTsdengji(item.getTsdengji());
         // 需求大类 未找到放原有的值
-        if (StringUtils.isNotEmpty(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictCode())){
+        or.setDemandTypeId(String.valueOf(item.getSpid()));
+        or.setDemandTypeName(item.getSpmc());
+
+        if (sysDictRefXLMapXq.containsKey(String.valueOf(item.getSpid()))){
             or.setDemandTypeId(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictCode());
             or.setDemandTypeName(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictValue());
-        } else {
-            or.setDemandTypeId(String.valueOf(item.getSpid()));
-            or.setDemandTypeName(item.getSpmc());
         }
 
-
         // 需求小类
-        if (!item.getXqxiaolei().equals(0L)){
-            or.setDemandSmallTypeId(sysDictRefXLMapXq.get(String.valueOf(item.getXqxiaolei())).get(0).getDictCode());
-            or.setDemandSmallTypeName(sysDictRefXLMapXq.get(String.valueOf(item.getXqxiaolei())).get(0).getDictValue());
+        or.setDemandSmallTypeId("");
+        or.setDemandSmallTypeName("");
+        if (!item.getXqxiaolei().equals(0L) && sysDictRefXLMapXq.containsKey(item.getXqxiaolei())) {
+            or.setDemandSmallTypeId(sysDictRefXLMapXq.get(item.getXqxiaolei()).get(0).getDictCode());
+            or.setDemandSmallTypeName(sysDictRefXLMapXq.get(item.getXqxiaolei()).get(0).getDictValue());
         } else {
-            or.setDemandSmallTypeId("");
-            or.setDemandSmallTypeName("");
+
         }
         or.setExtendField1(item.getExtjson1());
         or.setExtendField2(item.getExtjson2());
@@ -1321,14 +1321,17 @@ public class RepairBusiness {
             op.setPgguid(item.getPgguid());
             op.setMainId(order.getMainId());
             op.setMainName(order.getMainName());
-            op.setMainId(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictCode());
-            op.setMainName(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictValue());
-            if (!rec.getXlid().equals(0L)){
-                op.setSmallId(sysDictRefXLMap.get(String.valueOf(rec.getXlid())).get(0).getDictCode());
-                op.setSmallName(sysDictRefXLMap.get(String.valueOf(rec.getXlid())).get(0).getDictValue());
-            } else {
-                op.setSmallId(String.valueOf(rec.getXlid()));
-                op.setSmallName(rec.getXlmc());
+
+            if (sysDictRefDLMap.containsKey(rec.getSpid())){
+                op.setMainId(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictCode());
+                op.setMainName(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictValue());
+            }
+
+            op.setSmallId(rec.getXlid());
+            op.setSmallName(rec.getXlmc());
+            if (!rec.getXlid().equals(0L) && sysDictRefXLMap.containsKey(rec.getXlid())){
+                op.setSmallId(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictCode());
+                op.setSmallName(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictValue());
             }
 
             if (!rec.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(rec.getXiid())){
@@ -1435,7 +1438,11 @@ public class RepairBusiness {
     }
 
     @NotNull
-    private OrderProduct getOrderProduct(ItfTblAssignDownload item, OrderBase order, Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap, Map<String, List<SysDictRef>> sysDictRefXiLieMap, ItfTblAssignMxDownload rec, OrderPar mxreq) {
+    private OrderProduct getOrderProduct(ItfTblAssignDownload item, OrderBase order,
+                                         Map<String, List<SysDictRef>> sysDictRefDLMap,
+                                         Map<String, List<SysDictRef>> sysDictRefXLMap,
+                                         Map<String, List<SysDictRef>> sysDictRefXiLieMap,
+                                         ItfTblAssignMxDownload rec, OrderPar mxreq) {
         WebsitFWS websitFWS = new WebsitFWS();
         OrderProduct op = repairMxDownloadMapper.getMx(mxreq);
 
@@ -1448,24 +1455,29 @@ public class RepairBusiness {
         op.setServiceWebsit(websitFWS.getWebsitId());
 
         op.setOrderBaseId(order.getId());
+
         op.setPgguid(item.getPgguid());
-        op.setMainId(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictCode());
-        op.setMainName(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictValue());
-        if (!rec.getXlid().equals(0L)){
-            op.setSmallId(sysDictRefXLMap.get(String.valueOf(rec.getXlid())).get(0).getDictCode());
-            op.setSmallName(sysDictRefXLMap.get(String.valueOf(rec.getXlid())).get(0).getDictValue());
-        } else {
-            op.setSmallId(String.valueOf(rec.getXlid()));
-            op.setSmallName(rec.getXlmc());
+        op.setMainId(rec.getSpid());
+        op.setMainName(rec.getSpmc());
+        if (sysDictRefDLMap.containsKey(rec.getSpid())){
+            op.setMainId(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictCode());
+            op.setMainName(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictValue());
         }
 
+        op.setSmallId(rec.getXlid());
+        op.setSmallName(rec.getXlmc());
+        if (!rec.getXlid().equals(0L) && sysDictRefXLMap.containsKey(rec.getXlid())){
+            op.setSmallId(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictCode());
+            op.setSmallName(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictValue());
+        }
+
+        op.setSeriesId(rec.getXiid());
+        op.setSeriesName(rec.getXimc());
         if (!rec.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(rec.getXiid())){
             op.setSeriesId(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictCode());
             op.setSeriesName(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictValue());
-        } else {
-            op.setSeriesId(rec.getXiid());
-            op.setSeriesName(rec.getXimc());
         }
+
         return op;
     }
 

+ 4 - 0
src/main/java/com/zfire/jiasm/syncdata/gree/recycle/RecycleAcquisitionLogic.java

@@ -283,6 +283,10 @@ public class RecycleAcquisitionLogic {
 	 * 批量上传采集信息
 	 */
 	public void acquisitionUpload() {
+		if (1==1){
+            return;
+        }
+
 		// 回收工单同步记录表中提取待同步的 回收工单-采集主表
 		List<OrderRecycleUploadEvent> collectionEventList = orderRecycleUploadEventService.lambdaQuery()
 				.eq(OrderRecycleUploadEvent::getSynStatus, Constant.SynStatus.UN_SYN.getCode())

+ 11 - 3
src/main/java/com/zfire/jiasm/syncdata/gree/recycle/RecycleAssignLogic.java

@@ -129,7 +129,7 @@ public class RecycleAssignLogic {
 							continue;
 						}
 
-						// 状态为99的单独处理 只处理下载记录表,同步次数+1
+						// 状态为99的单独处理 超3次不再同步,逻辑与下同 只处理下载记录表,同步次数+1
 						if (nnMap !=null && nnMap.containsKey(o.getPgguid())){
 							process(nnMap, newTaskEntities, o);
 						} else {
@@ -240,15 +240,19 @@ public class RecycleAssignLogic {
 					});
 				}
 			});
+			// 插入下载主表
 			if( null != tblRecycleAssignEntity  && !tblRecycleAssignEntity.isEmpty()) {
 				recycleAssignService.saveOrUpdateBatch(tblRecycleAssignEntity);
 			}
+			// 插入下载反馈表
 			if(null != lastStep && !lastStep.isEmpty()) {
 				recycleAssignFkmxDownloadService.saveOrUpdateBatch(lastStep);
 			}
+			// 插入回收明细表
 			if(null != hscpmx && !hscpmx.isEmpty()) {
 				recycleAssignMxDownloadService.saveOrUpdateBatch(hscpmx);
 			}
+			// 插入下载记录表
 			if(null != recList && !recList.isEmpty()) {
 				recycleAssignBatchDownloadRecService.saveOrUpdateBatch(recList);
 			}
@@ -1069,7 +1073,11 @@ public class RecycleAssignLogic {
 	 * 状态上传接口
 	 */
 	public void statusUpload() {
-		// 回收工单同步记录表提取待同步的数据
+		if (1==1){
+            return;
+        }
+
+		// 回收工单同步记录表提取待同步的过程反馈数据数据
 		List<OrderRecycleUploadEvent> eventList = orderRecycleUploadEventService.lambdaQuery()
 				.eq(OrderRecycleUploadEvent::getOrderType, Constant.RecycleOrderType.RECYCLE_ASSIGN_FKMX)
 				.eq(OrderRecycleUploadEvent::getSynStatus, Constant.SynStatus.UN_SYN.getCode()).list();
@@ -1084,7 +1092,7 @@ public class RecycleAssignLogic {
 			});
 
 			if(!ids.isEmpty()) {
-				// 反馈明细表内根据id提取对应的数据
+				// 反馈明细表内根据id提取对应的反馈明细数据
 				List<OrderRecycleAssignFkmx> feedbackList = orderRecycleAssignFkmxService.lambdaQuery()
 						.in(OrderRecycleAssignFkmx::getId, ids).list();
 				if(CollectionUtils.isNotEmpty(feedbackList)) {

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFastEntryPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/admin-fast-entry")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFieldPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/admin-field")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModuleFavoritesPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/admin-module-favorites")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModulePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/admin-module")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminRolePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/admin-role")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserModuleRelaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/admin-user-module-rela")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/admin-user")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserRoleRelaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/admin-user-role-rela")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/admin-websit")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitProductTypeRelaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/admin-websit-product-type-rela")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitSlavePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/admin-websit-slave")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/AreaPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/area")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandLbsRelatePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/brand-lbs-relate")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/brand")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandWebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/brand-websit")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CityPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/city")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailLogPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/com-detail-log")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/com-detail")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComListPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/com-list")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CommonFilePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/common-file")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyCaAuthPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/company-ca-auth")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyRecordManagePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/company-record-manage")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ContractTemplatePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/contract-template")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationCategoryPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/customer-information-category")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/customer-information")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationWebsitPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/customer-information-websit")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ImgCarouselManagePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/img-carousel-manage")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InstallChargeConfigPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/install-charge-config")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureAgreePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/insure-agree")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/insure-email")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/insure-email-record")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsurePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/insure")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureRangePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/insure-range")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialFilePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/insure-worker-commercial-file")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/insure-worker-commercial")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/insure-worker-record")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralDoublePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/integral-double")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeConfigurePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/integral-grade-configure")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeExplainPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/integral-grade-explain")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeSkillPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/integral-grade-skill")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralOffsetPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/integral-offset")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralScorePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/integral-score")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralSkillLabelPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/integral-skill-label")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralWorkerApplyPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/integral-worker-apply")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfGreeToFaDownloadTaskPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-gree-to-fa-download-task")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignGzdmDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-gzdm-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXqxlDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xqxl-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlbDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxlb-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlyDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxly-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxqdDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-xxqd-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignYhsxWxDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-assign-yhsx-wx-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAzAssignXslxDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-az-assign-xslx-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-city-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityJdxzDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-city-jdxz-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCountyDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-county-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblProvinceDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-province-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbDaleiDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-dalei-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbJixinDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-jixin-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXiaoleiDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-xiaolei-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXilieDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-splb-xilie-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblWangdianWxgDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-wangdian-wxg-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblXinWangdianDownloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-xin-wangdian-download")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblYhsxViprankDowloadPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/itf-tbl-yhsx-viprank-dowload")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelCurrencyPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/label-currency")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/label")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/LbsAmapPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/lbs-amap")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/notice")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticeRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/notice-record")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/OperationLogPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/operation-log")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/product")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductSeriesPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/product-series")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProvincePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/province")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/QualificationsManagePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/qualifications-manage")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairBugPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/repair-bug")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairProjectPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/repair-project")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/SmsRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/sms-record")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/StreetPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/street")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/sys-dict")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictRefPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/sys-dict-ref")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictTypePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/sys-dict-type")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/ToolPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/tool")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/UserFeedbackPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/user-feedback")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/UserPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/user")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitEnclosureFilePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/websit-enclosure-file")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitExamineRecordPlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/websit-examine-record")

+ 1 - 1
src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitFilePlusTempController.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-28
+ * @since 2023-06-30
  */
 @Controller
 @RequestMapping("/plus/websit-file")

部分文件因为文件数量过多而无法显示