add

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

@@ -138,14 +138,12 @@ public interface PublicService {
     Insure getWebsitWorkerByWorkerAndWebsit(String type);
 
     void creatMkdir();
-
     Date subOneYear(Date dt);
-
     String path(String f);
-
     String uploadPath(String f);
-
     File createf(String name) throws IOException;
+    // 修改附件序 outid
+    void upOrderDetailFileOutId(String orderBaseId);
 
 
 

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

@@ -111,6 +111,8 @@ public class PublicServiceImpl implements PublicService {
     WebsitWorkerService websitWorkerService;
     @Resource
     InsureService insureService;
+    @Resource
+    OrderDetailFileService orderDetailFileService;
 
 
     private static String ALISMS_RESERVE = "尊敬的客户，您好！师傅上门时间为%s，服务网点电话：%s，如本次上门时间与您的安排有冲突，请拨打服务网点电话联系，我们将竭诚为您服务！";
@@ -1531,6 +1533,43 @@ public class PublicServiceImpl implements PublicService {
         return newFile;
     }
 
+    // 修改附件序
+    @Override
+    public void upOrderDetailFileOutId(String orderBaseId){
+        List<OrderDetailFile> upList = new ArrayList<>();
+        // 查看是否有需要修改的数据
+        List<OrderDetailFile> oids = orderDetailFileService.lambdaQuery()
+                .eq(OrderDetailFile::getOrderBaseId, orderBaseId)
+                .eq(OrderDetailFile::getOutId, 0)
+                .list();
+
+        List<OrderDetailFile> detaillist = orderDetailFileService.lambdaQuery()
+                .eq(OrderDetailFile::getOrderBaseId, orderBaseId)
+                .list();
+        // 找出最大的序 默认值为0
+        int outId=0;
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(detaillist) && org.apache.commons.collections4.CollectionUtils.isNotEmpty(oids)){
+            for (OrderDetailFile item:detaillist){
+                if (outId<item.getOutId()){
+                    outId = item.getOutId();
+                }
+            }
+            for (OrderDetailFile ite:detaillist){
+                if (ite.getOutId() == 0){
+                    outId++;
+                    ite.setOutId(outId);
+                    upList.add(ite);
+                }
+            }
+            // 修改序
+            if (upList.size()>0){
+                orderDetailFileService.updateBatchById(upList);
+                upList.clear();
+            }
+            detaillist.clear();
+        }
+    }
+
     private void setLocationByAddress(OrderBase orderBase) {
         if (StringUtils.isEmpty(orderBase.getLng()) || StringUtils.isEmpty(orderBase.getLat())) {
             String add = "";

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

@@ -180,7 +180,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 List<OutJiasmToGreeUploadTaskList> result = outJiasmToGreeUploadTaskListService.lambdaQuery()
                         .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
-                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,99L)// 测试用
+                        .eq(OutJiasmToGreeUploadTaskList::getSynReqId,115L)// 测试用
                         .orderByAsc(OutJiasmToGreeUploadTaskList::getSynReqId).list();
                 // 相同任务类型的数据逐个处理
                 for (OutJiasmToGreeUploadTaskList row: result){
@@ -1038,15 +1038,92 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         // 采集明细表全表更新pgid = brand_pgid
         upBrandPgid(orderBase);
 
+
+        // 故障现象原因序
+        upOrderRepairDetailReasonOutId(orderBase.getId());
+
         // 修改 维修现象主键、维修明细主键
         upOrderRepairDetailReason(orderBase.getId());
 
+        // 修改附件序 outid
+        upOrderDetailFileOutId(orderBase.getId());
+
         // 上传图片
         generateFileInit(orderBase);
 
         return checkOrderDetailFile(orderBase.getId());
     }
 
+    public void upOrderDetailFileOutId(String orderBaseId) {
+        List<OrderDetailFile> upList = new ArrayList<>();
+        // 查看是否有需要修改的数据
+        List<OrderDetailFile> oids = orderDetailFileService.lambdaQuery()
+                .eq(OrderDetailFile::getOrderBaseId, orderBaseId)
+                .eq(OrderDetailFile::getOutId, 0)
+                .list();
+
+        List<OrderDetailFile> detaillist = orderDetailFileService.lambdaQuery()
+                .eq(OrderDetailFile::getOrderBaseId, orderBaseId)
+                .list();
+        // 找出最大的序 默认值为0
+        int outId=0;
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(detaillist) && org.apache.commons.collections4.CollectionUtils.isNotEmpty(oids)){
+            for (OrderDetailFile item:detaillist){
+                if (outId<item.getOutId()){
+                    outId = item.getOutId();
+                }
+            }
+            for (OrderDetailFile ite:detaillist){
+                if (ite.getOutId() == 0){
+                    outId++;
+                    ite.setOutId(outId);
+                    upList.add(ite);
+                }
+            }
+            // 修改序
+            if (upList.size()>0){
+                orderDetailFileService.updateBatchById(upList);
+                upList.clear();
+            }
+            detaillist.clear();
+        }
+    }
+
+    public void upOrderRepairDetailReasonOutId(String orderBaseId) {
+        List<OrderRepairDetailReason> upList = new ArrayList<>();
+        // 查看是否有需要修改的数据
+        List<OrderRepairDetailReason> oids = orderRepairDetailReasonService.lambdaQuery()
+                .eq(OrderRepairDetailReason::getOrderBaseId, orderBaseId)
+                .eq(OrderRepairDetailReason::getOutId, 0)
+                .list();
+
+        List<OrderRepairDetailReason> detaillist = orderRepairDetailReasonService.lambdaQuery()
+                .eq(OrderRepairDetailReason::getOrderBaseId, orderBaseId)
+                .list();
+        // 找出最大的序 默认值为0
+        int outId=0;
+        if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(detaillist) && org.apache.commons.collections4.CollectionUtils.isNotEmpty(oids)){
+            for (OrderRepairDetailReason item:detaillist){
+                if (outId<item.getOutId()){
+                    outId = item.getOutId();
+                }
+            }
+            for (OrderRepairDetailReason ite:detaillist){
+                if (ite.getOutId() == 0){
+                    outId++;
+                    ite.setOutId(outId);
+                    upList.add(ite);
+                }
+            }
+            // 修改序
+            if (upList.size()>0){
+                orderRepairDetailReasonService.updateBatchById(upList);
+                upList.clear();
+            }
+            detaillist.clear();
+        }
+    }
+
 
     public Boolean checkOrderDetailFile(String id) {
         List<OrderDetailFile> detailFiles = new ArrayList<>();
@@ -1460,7 +1537,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     public void generateJyktU(List<ItfTblWxjsXxyyJyktUpload> jyktus, OrderRepairDetail detail, OrderRepairDetailReason r) {
         ItfTblWxjsXxyyJyktUpload add = new ItfTblWxjsXxyyJyktUpload();
         add.setWorkerOrderNo(detail.getOrderBaseId());
-        add.setFaOrderRepairFaultInfoId(Integer.valueOf(String.valueOf(r.getCreateTime().getTime())));
+        add.setFaOrderRepairFaultInfoId(r.getOutId());
         add.setXxyyguid(r.getXxyyguid());
         add.setCreatedBy("guangfo");
         add.setCreatedDate(r.getCreateTime());

src/main/resources/generator-dev.properties

@@ -1,11 +1,8 @@
 java.package=com.zfire.jiasm.syncdata
-#jdbc.url=jdbc:mysql://121.43.111.127:3306/jiasm?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8
-#jdbc.username=root
-#jdbc.pwd=xch!eCdvc124@
+jdbc.url=jdbc:mysql://121.43.111.127:3306/jiasm?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8
+jdbc.username=root
+jdbc.pwd=xch!eCdvc124@
 
-jdbc.url=jdbc:mysql://pc-wz9ualr91v12g50w0.rwlb.rds.aliyuncs.com:3306/jiasm_prd?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8
-jdbc.username=jiasm_sync
-jdbc.pwd=dvuol*v()d5@12SdG
 
 tables=
 tablePrefixs=

src/main/resources/mapper/FileOrderDetailMapper.xml

@@ -75,7 +75,7 @@
     </select>
 
     <select id="getItfTblWxjsFjJyktUpload" parameterType="com.zfire.jiasm.syncdata.parameter.InstallCJDetailFile" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblWxjsFjJyktUpload">
-        select a.order_base_id as worker_order_no,UNIX_TIMESTAMP(a.create_time) as fa_order_repair_annex_id,
+        select a.order_base_id as worker_order_no,out_id as fa_order_repair_annex_id,
                a.fjguid,'guangfo' as created_by,a.create_time as created_date,
                'guangfo' as last_modified_by,a.update_time as last_modified_date,
                b.brand_wxjsguid as wxjsguid,a.brand_file_path as wjlj,a.create_time as cjsj,

src/main/resources/mapper/ReasonOrderRepairDetailMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.zfire.jiasm.syncdata.dao.mapper.ReasonOrderRepairDetailMapper">
 
     <select id="getItfTblWxjsWxxmJyktUpload" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblWxjsWxxmJyktUpload">
-        select UNIX_TIMESTAMP(a.create_time) as fa_order_repair_annex_id,
-               UNIX_TIMESTAMP(a.create_time) as wxxmguid,'guangfo' as created_by,
+        select a.out_id as fa_order_repair_annex_id,
+               a.out_id as wxxmguid,'guangfo' as created_by,
                a.create_time as created_date,'guangfo' as last_modified_by,
                a.update_time as last_modified_date,
                b.brand_wxjsguid as wxjsguid,a.repair_item_id as wxxmh,a.remark as mshu,b.repair_fees as wxfy,c.number as xxyyh,
@@ -17,8 +17,8 @@
     </select>
 
     <select id="getItfTblAssignFeeUpload" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblAssignFeeUpload">
-        select UNIX_TIMESTAMP(a.create_time) as fa_order_repair_annex_id,
-               UNIX_TIMESTAMP(a.create_time) as id,'guangfo' as created_by,
+        select a.out_id as fa_order_repair_annex_id,
+               a.out_id as id,'guangfo' as created_by,
                a.create_time as created_date,'guangfo' as last_modified_by,
                a.update_time as last_modified_date,1 as flag,b.repair_fees as fee,
                a.remark as mshu,d.ref_dict_code as spid
@@ -30,7 +30,7 @@
     </select>
 
     <select id="getItfTblWxjsPjmxJyktUpload" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblWxjsPjmxJyktUpload">
-        select UNIX_TIMESTAMP(a.create_time) as fa_order_repair_part_info_id,ifnull(a.wxjsguid,'') as wxjsmxguid,
+        select a.out_id as fa_order_repair_part_info_id,ifnull(a.wxjsguid,'') as wxjsmxguid,
                'guangfo' as created_by,a.create_time as created_date,'guangfo' as last_modified_by,
                a.update_time as last_modified_date,b.brand_wxjsguid as wxjsguid,
                a.old_part_no as jpjbh,a.old_part_name as jpjmc,0 as jpjsl,0 as jpjdj,0 as jpjje,a.new_part_no as xpjbh,