yaozhixue 1 год назад
Родитель
Сommit
b03ae6d171
100 измененных файлов с 269 добавлено и 168 удалено
  1. 49 0
      src/main/java/com/zfire/jiasm/syncdata/common/AddJdueServiceImpl.java
  2. 119 70
      src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusiness.java
  3. 4 1
      src/main/java/com/zfire/jiasm/syncdata/download/order/数据下载.txt
  4. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFastEntryPlusTempController.java
  5. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminFieldPlusTempController.java
  6. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModuleFavoritesPlusTempController.java
  7. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminModulePlusTempController.java
  8. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminRolePlusTempController.java
  9. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserModuleRelaPlusTempController.java
  10. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserPlusTempController.java
  11. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminUserRoleRelaPlusTempController.java
  12. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitPlusTempController.java
  13. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitProductTypeRelaPlusTempController.java
  14. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AdminWebsitSlavePlusTempController.java
  15. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/AreaPlusTempController.java
  16. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandLbsRelatePlusTempController.java
  17. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandPlusTempController.java
  18. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/BrandWebsitPlusTempController.java
  19. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CityPlusTempController.java
  20. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailLogPlusTempController.java
  21. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComDetailPlusTempController.java
  22. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ComListPlusTempController.java
  23. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CommonFilePlusTempController.java
  24. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyCaAuthPlusTempController.java
  25. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CompanyRecordManagePlusTempController.java
  26. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ContractTemplatePlusTempController.java
  27. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationCategoryPlusTempController.java
  28. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationPlusTempController.java
  29. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/CustomerInformationWebsitPlusTempController.java
  30. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ImgCarouselManagePlusTempController.java
  31. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InstallChargeConfigPlusTempController.java
  32. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureAgreePlusTempController.java
  33. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailPlusTempController.java
  34. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureEmailRecordPlusTempController.java
  35. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsurePlusTempController.java
  36. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureRangePlusTempController.java
  37. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialFilePlusTempController.java
  38. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerCommercialPlusTempController.java
  39. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/InsureWorkerRecordPlusTempController.java
  40. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralDoublePlusTempController.java
  41. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeConfigurePlusTempController.java
  42. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeExplainPlusTempController.java
  43. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralGradeSkillPlusTempController.java
  44. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralOffsetPlusTempController.java
  45. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralScorePlusTempController.java
  46. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralSkillLabelPlusTempController.java
  47. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/IntegralWorkerApplyPlusTempController.java
  48. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignGzdmDowloadPlusTempController.java
  49. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXqxlDowloadPlusTempController.java
  50. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlbDowloadPlusTempController.java
  51. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxlyDowloadPlusTempController.java
  52. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignXxqdDowloadPlusTempController.java
  53. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAssignYhsxWxDowloadPlusTempController.java
  54. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblAzAssignXslxDowloadPlusTempController.java
  55. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityDownloadPlusTempController.java
  56. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCityJdxzDownloadPlusTempController.java
  57. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblCountyDownloadPlusTempController.java
  58. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblProvinceDownloadPlusTempController.java
  59. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbDaleiDownloadPlusTempController.java
  60. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbJixinDownloadPlusTempController.java
  61. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXiaoleiDownloadPlusTempController.java
  62. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblSplbXilieDownloadPlusTempController.java
  63. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblWangdianWxgDownloadPlusTempController.java
  64. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblXinWangdianDownloadPlusTempController.java
  65. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ItfTblYhsxViprankDowloadPlusTempController.java
  66. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelCurrencyPlusTempController.java
  67. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/LabelPlusTempController.java
  68. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/LbsAmapPlusTempController.java
  69. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticePlusTempController.java
  70. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/NoticeRecordPlusTempController.java
  71. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/OperationLogPlusTempController.java
  72. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductPlusTempController.java
  73. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProductSeriesPlusTempController.java
  74. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ProvincePlusTempController.java
  75. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/QualificationsManagePlusTempController.java
  76. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairBugPlusTempController.java
  77. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/RepairProjectPlusTempController.java
  78. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SmsRecordPlusTempController.java
  79. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/StreetPlusTempController.java
  80. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictPlusTempController.java
  81. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictRefPlusTempController.java
  82. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/SysDictTypePlusTempController.java
  83. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/ToolPlusTempController.java
  84. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/UserFeedbackPlusTempController.java
  85. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/UserPlusTempController.java
  86. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitEnclosureFilePlusTempController.java
  87. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitExamineRecordPlusTempController.java
  88. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitFilePlusTempController.java
  89. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitMainInfoChangeDataPlusTempController.java
  90. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitMainInfoChangePlusTempController.java
  91. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitOrderSignPlusTempController.java
  92. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitPlusTempController.java
  93. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitServiceCategoryDetailPlusTempController.java
  94. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WebsitServiceCategoryPlusTempController.java
  95. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerBrandAccountPlusTempController.java
  96. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerCertPlusTempController.java
  97. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerChangeIntegralRecordPlusTempController.java
  98. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerComListPlusTempController.java
  99. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerComListWorkerPlusTempController.java
  100. 1 1
      src/main/java/com/zfire/jiasm/syncdata/plus/controller/WorkerGradeRecordPlusTempController.java

+ 49 - 0
src/main/java/com/zfire/jiasm/syncdata/common/AddJdueServiceImpl.java

@@ -0,0 +1,49 @@
+package com.zfire.jiasm.syncdata.common;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class AddJdueServiceImpl {
+
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+
+	public List<Map<String, Object>> getTaskData(String tabName, boolean isFilterOrderNo) {
+		List<Map<String, Object>> result = jdbcTemplate.queryForList("SELECT * FROM " + tabName + " where syn_status=0 "
+				+ (isFilterOrderNo ? " and (orderNo is not null and orderNo<>'') " : "") + " order by syn_req_id ");
+		return result;
+	}
+
+	public List<Map<String, Object>> getTaskData4Tmall() {
+		List<Map<String, Object>> result = jdbcTemplate.queryForList(
+				"SELECT * FROM " + "itf_tbl_tmall_fkmx_req" + " where syn_status=0 " + " order by syn_req_id ");
+		return result;
+	}
+
+	public void updateError(String tabName, Long synReqId, String synErrMsg) throws Exception {
+		jdbcTemplate.update("update " + tabName + " set syn_err_msg=? where syn_req_id=?",
+				new Object[] { synErrMsg, synReqId });
+	}
+
+	public void updateSuccess(Long synReqId, String tabName) {
+		jdbcTemplate.update("update " + tabName + " set syn_status=1,syn_time=? where syn_req_id=?",
+				new Object[] { new Date(System.currentTimeMillis()), synReqId });
+	}
+	
+	public void updateJDFinish(Long synReqId, String tabName,String errorMessage) {
+		jdbcTemplate.update("update " + tabName + " set syn_status=2,syn_time=?,syn_err_msg=? where syn_req_id=?",
+				new Object[] { new Date(System.currentTimeMillis()), errorMessage,synReqId });
+	}
+
+	public void updateTmallSuccess(Long synReqId, Long fkguid) {
+		jdbcTemplate.update("update itf_tbl_tmall_fkmx_req set syn_status=1,syn_time=?,fkguid=? where syn_req_id=?",
+				new Object[] { new Date(System.currentTimeMillis()), fkguid, synReqId });
+	}
+
+}

+ 119 - 70
src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusiness.java

@@ -191,7 +191,8 @@ public class InstallBusiness {
         List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>();
         List<OrderApplyDispatch> oads = new ArrayList<>();
         List<OrderInstallDetail> oids = new ArrayList<>();
-        List<String> oiddels = new ArrayList<>();
+        List<String> delOrderProduct = new ArrayList<>();
+        List<String> delOrderInstallDetail = new ArrayList<>();
         List<OrderDetailFile> odfs = new ArrayList<>();
 
         // 提取本地订单
@@ -215,7 +216,7 @@ public class InstallBusiness {
 
         // 获取产品明细要同步的数据 -只存在修改,减少与增加的情况不存在
         getOrderProductsUpdate(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, old, newLCLS,
-                item.getDownloadTaskNo(),mxsynreqids,orderProductsUpdate,oids,oiddels,odfs);
+                item.getDownloadTaskNo(),mxsynreqids,orderProductsUpdate,oids,delOrderInstallDetail,odfs,delOrderProduct);
 
         // 获取操作明细同步数据,即反馈明细
         addoiolList = getOrderInstallOperatingLogsadd(item, old, newLCLS, synreqids);
@@ -246,7 +247,7 @@ public class InstallBusiness {
         // 安装工单数据修改落本地表
         addOrUpdateOrderData(item, upInfo, own, mxsynreqids, orderProductsUpdate, synreqids,
                 addoiolList, fyqd, orderInstall, synReqYfYyIds, addoalists, getpjSynReqId,
-                addoalist, faGreeSms,orderAppeal, its,oads,oids, oiddels,odfs);
+                addoalist, faGreeSms,orderAppeal, its,oads,oids, delOrderInstallDetail,odfs,delOrderProduct);
     }
 
     public void addOrUpdateOrderData(ItfTblAzAssignLcLsDownload item, OrderBase upInfo, OrderWorker own,
@@ -256,7 +257,7 @@ public class InstallBusiness {
                                      List<OrderReAppointment> addoalists, List<Long> getpjSynReqId, List<OrderAppraise> addoalist,
                                      List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal,List<ItfGreeToFaDownloadTaskList> its,
                                      List<OrderApplyDispatch> oads,List<OrderInstallDetail> oids,
-                                     List<String> oiddels,List<OrderDetailFile> odfs) {
+                                     List<String> oiddels,List<OrderDetailFile> odfs,List<String> delOrderProduct) {
         // 同步修改订单基础表
         if (upInfo !=null){
             orderBaseService.updateById(upInfo);
@@ -346,11 +347,17 @@ public class InstallBusiness {
             orderInstallDetailService.removeByIds(oiddels);
             oiddels.clear();
         }
+        // 删除产品机型
+        if (delOrderProduct.size()>0){
+            orderProductService.removeByIds(delOrderProduct);
+            delOrderProduct.clear();
+        }
         // 新增采集附件
         if (odfs.size()>0){
             orderDetailFileService.saveOrUpdateBatch(odfs);
             odfs.clear();
         }
+
         // 客户评价
         if (getpjSynReqId.size()>0){
             upItfTblAzAssignSatisfactionDownload(getpjSynReqId);
@@ -500,16 +507,10 @@ public class InstallBusiness {
                                         List<ItfTblAzAssignMxDownload> synreqids,
                                         List<OrderProduct> orderProductsUpdate,
                                         List<OrderInstallDetail> oids,List<String> oiddels,
-                                        List<OrderDetailFile> odfs) {
+                                        List<OrderDetailFile> odfs,
+                                        List<String> delOrderProduct) {
         List<OrderProduct> orderProductsOld = new ArrayList<>();
-        List<OrderInstallDetail> oldOids = new ArrayList<>();
-        Map<String,List<OrderInstallDetail>> oldOidsMap = new HashMap<>();
-        Map<String,List<OrderProduct>> oldProductMap = new HashMap<>();
-
-        // 提取现有的采集明细数据
-        oldOids= orderInstallDetailService.lambdaQuery()
-                .eq(OrderInstallDetail::getOrderBaseId,old.getId()).list();
-        oldOidsMap = oldOids.stream().collect(Collectors.groupingBy(OrderInstallDetail::getOrderProductId));
+        List<String> orderMxList = new ArrayList<>();
 
         // 提取下载产品明细表
         List<ItfTblAzAssignMxDownload> orderMx = itfTblAzAssignMxDownloadService.lambdaQuery()
@@ -517,15 +518,55 @@ public class InstallBusiness {
                 .eq(ItfTblAzAssignMxDownload::getSynStatus,0)
                 .orderByAsc(ItfTblAzAssignMxDownload::getSynReqId)
                 .list();
+        orderMx.stream().forEach(mx->{
+            orderMxList.add(mx.getPgmxid());
+        });
 
         // 提取本地现有的产品机型
         orderProductsOld = orderProductService.lambdaQuery()
                 .eq(OrderProduct::getOrderBaseId, old.getId()).list();
-        oldProductMap = orderProductsOld.stream().collect(Collectors.groupingBy(OrderProduct::getPgmxid));
 
-        // pgmxid主键
+        // 新增或是修改
+        if (addOrUp(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, old, newLCLS, synreqids,
+                orderProductsUpdate, oids, oiddels, odfs, orderProductsOld,orderMx)){
+            return;
+        }
 
-        for (ItfTblAzAssignMxDownload mx:orderMx){
+        // 处理总部删除的情况
+        for (OrderProduct o : orderProductsOld) {
+            if (!orderMxList.contains(o.getPgmxid())){
+                // 移除产品机型
+                delOrderProduct.add(o.getId());
+                // 需要移除采集明细
+                // 提取 采集记录
+                List<OrderInstallDetail> olds = new ArrayList<>();
+                olds = orderInstallDetailService.lambdaQuery()
+                        .eq(OrderInstallDetail::getOrderBaseId, o.getOrderBaseId())
+                        .eq(OrderInstallDetail::getOrderProductId, o.getId()).list();
+                for (OrderInstallDetail i:olds){
+                    oiddels.add(i.getId());
+                }                                
+            }
+        }
+    }
+
+    private boolean addOrUp(Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap,
+                            Map<String, List<SysDictRef>> sysDictRefXiLieMap, OrderBase old, OrderBase newLCLS,
+                            List<ItfTblAzAssignMxDownload> synreqids, List<OrderProduct> orderProductsUpdate,
+                            List<OrderInstallDetail> oids, List<String> oiddels, List<OrderDetailFile> odfs,
+                            List<OrderProduct> orderProductsOld,
+                            List<ItfTblAzAssignMxDownload> orderMx) {
+        // 提取现有的采集明细数据
+        List<OrderInstallDetail> oldOids = new ArrayList<>();
+        Map<String,List<OrderProduct>> oldProductMap = new HashMap<>();
+        Map<String,List<OrderInstallDetail>> oldOidsMap = new HashMap<>();
+        oldOids= orderInstallDetailService.lambdaQuery()
+                .eq(OrderInstallDetail::getOrderBaseId,old.getId()).list();
+        oldOidsMap = oldOids.stream().collect(Collectors.groupingBy(OrderInstallDetail::getOrderProductId));
+
+        oldProductMap = orderProductsOld.stream().collect(Collectors.groupingBy(OrderProduct::getPgmxid));
+
+        for (ItfTblAzAssignMxDownload mx: orderMx){
             // 这里做法为重新生成新的产品机型,然后与本地比较是新增还是修改
             // 生成工单产品对象 获取新同步的工单机型
             OrderProduct n = getProductInfo(sysDictRefDLMap, sysDictRefXLMap, sysDictRefXiLieMap, newLCLS, mx);
@@ -544,60 +585,8 @@ public class InstallBusiness {
             }
             // 看是否已同步过的 如是已同步过来,需调整数量 调整的数据就是生成的产品机型 n
             if (oldProductMap.containsKey(mx.getPgmxid())){
-                OrderProduct oldOpt = oldProductMap.get(mx.getPgmxid()).get(0);
-                if (!oldOpt.getNum().equals(shul)){
-                    // 看已采集数
-                    for (OrderInstallDetail oid : oldOidsMap.get(oldOpt.getId())) {
-                        if (oid.getStatus().equals(1)) {
-                            oldnum++;
-                        }
-                    }
-                    if (oldnum>shul){
-                        synItfTblAzAssignMxDownload(mx.getSynReqId(),9,
-                                "总部修改的产品数不能小于已采集数,需人工处理,工单号:"+old.getId());
-                        return;
-                    }
-                    // 如果产品数量大于已采集数则可以更新产品表的数量  这里的n就是本次处理的,新增的N不可能找到
-                    n.setUndoneNum(n.getNum()-oldnum);
-
-                    // 比较新旧数量,如果新数量少就删除,如果多就新增
-                    // 原产品数量大于新的产品数量,删除采集记录
-                    if (oldOpt.getNum()>shul){
-                        int insertNum = 1;
-                        // 提取 采集记录
-                        List<OrderInstallDetail> olds = new ArrayList<>();
-                        olds= orderInstallDetailService.lambdaQuery()
-                                .eq(OrderInstallDetail::getOrderBaseId,old.getId())
-                                .eq(OrderInstallDetail::getOrderProductId,n.getId())
-                                .eq(OrderInstallDetail::getStatus,0)
-                                .orderByAsc(OrderInstallDetail::getOutId).list();
-
-                        // 存在未采集的数据删除,其他不删
-                        if (olds.size()>1){
-                            int oldssize = olds.size()-1;
-                            while (insertNum <= (oldOpt.getNum() - shul)){
-                                oiddels.add(olds.get(oldssize).getId());
-                                oldssize-- ;
-                                insertNum++;
-                            }
-                        }
-                    } else if (oldOpt.getNum()<shul) {
-                        // 提取 采集记录
-                        List<OrderInstallDetail> olds = new ArrayList<>();
-                        OrderInstallDetail iod = new OrderInstallDetail();
-                        olds= orderInstallDetailService.lambdaQuery()
-                                .eq(OrderInstallDetail::getOrderBaseId,old.getId())
-                                .eq(OrderInstallDetail::getOrderProductId,n.getId())
-                                .orderByAsc(OrderInstallDetail::getOutId).list();
-                        // 原产品数量小于新的产品数量,需要新增记录
-                        // 生成采集明细数据+附件数据
-                        // 取最大的序
-                        int insertnum = 0;
-                        int outid = 0;
-                        insertnum =olds.get(olds.size()-1).getOutId()+1;
-                        outid = insertnum;
-                        extracted(old, oids, odfs, insertnum, outid, mx, n);
-                    }
+                if (upProductAndDetail(old, oids, oiddels, odfs, oldOidsMap, oldProductMap, mx, n, oldnum, shul)) {
+                    return true;
                 }
             } else {
                 // 这里为新增,需要新增对应的采集及附件
@@ -615,6 +604,66 @@ public class InstallBusiness {
             mxu.setSynTime(new Date());
             synreqids.add(mxu);
         }
+        return false;
+    }
+
+    private boolean upProductAndDetail(OrderBase old, List<OrderInstallDetail> oids, List<String> oiddels, List<OrderDetailFile> odfs, Map<String, List<OrderInstallDetail>> oldOidsMap, Map<String, List<OrderProduct>> oldProductMap, ItfTblAzAssignMxDownload mx, OrderProduct n, int oldnum, int shul) {
+        OrderProduct oldOpt = oldProductMap.get(mx.getPgmxid()).get(0);
+        if (!oldOpt.getNum().equals(shul)){
+            // 看已采集数
+            for (OrderInstallDetail oid : oldOidsMap.get(oldOpt.getId())) {
+                if (oid.getStatus().equals(1)) {
+                    oldnum++;
+                }
+            }
+            if (oldnum > shul){
+                synItfTblAzAssignMxDownload(mx.getSynReqId(),9,
+                        "总部修改的产品数不能小于已采集数,需人工处理,工单号:"+ old.getId());
+                return true;
+            }
+            // 如果产品数量大于已采集数则可以更新产品表的数量  这里的n就是本次处理的,新增的N不可能找到
+            n.setUndoneNum(n.getNum()- oldnum);
+
+            // 比较新旧数量,如果新数量少就删除,如果多就新增
+            // 原产品数量大于新的产品数量,删除采集记录
+            if (oldOpt.getNum()> shul){
+                int insertNum = 1;
+                // 提取 采集记录
+                List<OrderInstallDetail> olds = new ArrayList<>();
+                olds= orderInstallDetailService.lambdaQuery()
+                        .eq(OrderInstallDetail::getOrderBaseId, old.getId())
+                        .eq(OrderInstallDetail::getOrderProductId, n.getId())
+                        .eq(OrderInstallDetail::getStatus,0)
+                        .orderByAsc(OrderInstallDetail::getOutId).list();
+
+                // 存在未采集的数据删除,其他不删
+                if (olds.size()>1){
+                    int oldssize = olds.size()-1;
+                    while (insertNum <= (oldOpt.getNum() - shul)){
+                        oiddels.add(olds.get(oldssize).getId());
+                        oldssize-- ;
+                        insertNum++;
+                    }
+                }
+            } else if (oldOpt.getNum()< shul) {
+                // 提取 采集记录
+                List<OrderInstallDetail> olds = new ArrayList<>();
+                OrderInstallDetail iod = new OrderInstallDetail();
+                olds= orderInstallDetailService.lambdaQuery()
+                        .eq(OrderInstallDetail::getOrderBaseId, old.getId())
+                        .eq(OrderInstallDetail::getOrderProductId, n.getId())
+                        .orderByAsc(OrderInstallDetail::getOutId).list();
+                // 原产品数量小于新的产品数量,需要新增记录
+                // 生成采集明细数据+附件数据
+                // 取最大的序
+                int insertnum = 0;
+                int outid = 0;
+                insertnum =olds.get(olds.size()-1).getOutId()+1;
+                outid = insertnum;
+                extracted(old, oids, odfs, insertnum, outid, mx, n);
+            }
+        }
+        return false;
     }
 
 

+ 4 - 1
src/main/java/com/zfire/jiasm/syncdata/download/order/数据下载.txt

@@ -46,4 +46,7 @@ and a.download_status=0 and (download_times is null or download_times<=5) order
 商户同一个销售网点可以对应多个服务商销售网点
 1:从 customer_information_websit 表根据 ref_websit_id 提取 websit_id
 2:去 websit_service_category_detail 表判断服务商销售网点是否满足订单的大类
-   服务商销售网点不会存在存在多个的情况
+   服务商销售网点不会存在存在多个的情况
+
+
+一个批次多单 相同单相同任务号,

+ 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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @Controller
 @RequestMapping("/plus/integral-worker-apply")

+ 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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @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-08
+ * @since 2023-06-10
  */
 @Controller
 @RequestMapping("/plus/websit-file")

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-08
+ * @since 2023-06-10
  */
 @Controller
 @RequestMapping("/plus/websit-main-info-change-data")

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-08
+ * @since 2023-06-10
  */
 @Controller
 @RequestMapping("/plus/websit-main-info-change")

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

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

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

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

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Controller;
  * </p>
  *
  * @author gejiang
- * @since 2023-06-08
+ * @since 2023-06-10
  */
 @Controller
 @RequestMapping("/plus/websit-service-category-detail")

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Некоторые файлы не были показаны из-за большого количества измененных файлов