add

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

@@ -148,34 +148,39 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 return Boolean.FALSE;
             }
 
-            // 修改采集明细表与采集条码表ID
-            upOutId(ojtutl.getId());
+            // 初始化数据
+            upInit(ojtutl, CategoryRefmap, orderBase);
+        }
 
-            // 采集明细表中的pgguid 改成工单基础表的pgguid
-            upInstallDetailPgguid(orderBase);
+        return orderBaseInstallProc(brand, ojtutl, CategoryRefmap, orderBase);
+    }
 
-            // 修改采集明细的序 pgwcmxid(自生成) 生成格力总部-采集明细序号
-            upPgwcmxid(ojtutl);
+    private void upInit(@NotNull OutJiasmToGreeUploadTaskList ojtutl, Map<String, List<SysDictRef>> CategoryRefmap, OrderBase orderBase) {
+        // 修改采集明细表与采集条码表ID
+        upOutId(ojtutl.getId());
 
-            // 采集条码表中的pgguid 统一改成工单基础表的pgguid,tmguid自生成
-            upOrderInstallDetailCodePgguid(ojtutl, orderBase);
+        // 采集明细表中的pgguid 改成工单基础表的pgguid
+        upInstallDetailPgguid(orderBase);
 
-            // 特殊安装确认书图从采集明细表中移到附件表中
-            addTSHJP(ojtutl, orderBase);
+        // 修改采集明细的序 pgwcmxid(自生成) 生成格力总部-采集明细序号
+        upPgwcmxid(ojtutl);
 
-            // 上传附件表图片信息
-            uploadOrderDetailFile(ojtutl, CategoryRefmap, orderBase);
+        // 采集条码表中的pgguid 统一改成工单基础表的pgguid,tmguid自生成
+        upOrderInstallDetailCodePgguid(ojtutl, orderBase);
 
-            // 管理端采集的条码图并没全部给到采集条码表中，这里需要转移到采集条码表中
-            List<OrderInstallDetail> details = orderInstallDetailService.lambdaQuery()
-                    .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId())
-                    .eq(OrderInstallDetail::getStatus, 1).list();
-            for (OrderInstallDetail detail:details){
-                upCodep(detail);
-            }
-        }
+        // 特殊安装确认书图从采集明细表中移到附件表中
+        addTSHJP(ojtutl, orderBase);
 
-        return orderBaseInstallProc(brand, ojtutl, CategoryRefmap, orderBase);
+        // 上传附件表图片信息
+        uploadOrderDetailFile(ojtutl, CategoryRefmap, orderBase);
+
+        // 管理端采集的条码图并没全部给到采集条码表中，这里需要转移到采集条码表中
+        List<OrderInstallDetail> details = orderInstallDetailService.lambdaQuery()
+                .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId())
+                .eq(OrderInstallDetail::getStatus, 1).list();
+        for (OrderInstallDetail detail:details){
+            upCodep(detail);
+        }
     }
 
     private void addTSHJP(@NotNull OutJiasmToGreeUploadTaskList ojtutl, OrderBase orderBase) {
@@ -190,6 +195,10 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 .eq(OrderDetailFile::getFileType, 44).last("limit 1").one();
         if (iods != null){
             OrderDetailFile addFile = new OrderDetailFile();
+            // 存在且相同时不处理
+            if (detailFiles != null && detailFiles.getFilePath().equals(iods.getSpecialSignUrl())){
+                return;
+            }
             // 存在且不相同时重修改
             if (detailFiles != null && !detailFiles.getFilePath().equals(iods.getSpecialSignUrl())){
 
@@ -246,12 +255,13 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 .last("limit 1")
                 .one();
 
-        // 采集表与采集条码表ID超范围 - 采集表及采集条码明细表中的outid统一修改
-        upOutId(ojtutl.getId());
         if (orderBase !=null ){
             // 安装工单产品信息,操作日志,完工明细,完工明细附件
             // 预约改约-总部短信发送请求表,派服务人员-短信发送请求表 以主表的pgguid统一修改
             upPgguid(orderBase);
+
+            // 初始化数据
+            upInit(ojtutl, CategoryRefmap, orderBase);
         }
 
         return orderInstallCjOrWg(cjOrWg, brand, ojtutl, CategoryRefmap,orderBase);
@@ -692,6 +702,9 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             case 43:
                 result = 5;
                 break;
+            case 44:
+                result = 8;
+                break;
         }
         return result;
     }
@@ -796,22 +809,18 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 OrderDetailFile upf = new OrderDetailFile();
                 upf.setId(file.getId());
                 upf.setPgwcmxid(detailone.getPgwcmxid());
+                // 修改附件的fjguid
+                if (StringUtils.isEmpty(file.getFjguid())){
+                    upf.setFjguid(UUID.randomUUID().toString());
+                }
                 orderDetailFileService.updateById(upf);
             }
+
             // 采集附件表中的pgguid 统一改成工单基础表的pgguid 可以不用，从主表取即可 无pgguid字段
             InstallCJDetailFile upfile = new InstallCJDetailFile();
             upfile.setOrderNo(file.getOrderBaseId());
             upfile.setPgguId(orderBase.getPgguid());
             fileOrderDetailMapper.updateFilePgguid(upfile);
-
-
-            // 修改附件的fjguid
-            if (detailone != null && StringUtils.isEmpty(file.getFjguid())){
-                OrderDetailFile upf = new OrderDetailFile();
-                upf.setId(file.getId());
-                upf.setFjguid(UUID.randomUUID().toString());
-                orderDetailFileService.updateById(upf);
-            }
         }
     }
 
@@ -937,7 +946,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
             // 同步采集明细数据
             List<OrderInstallDetail> details = orderInstallDetailService.lambdaQuery()
-                    .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId()).list();
+                    .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId())
+                    .list();
             for (OrderInstallDetail detail:details){
                 // 状态:3=临时保存;2=作废,1=已采集,0=未采集
                 if ((detail.getStatus().equals(1) || detail.getStatus().equals(2)) &&
@@ -1104,15 +1114,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 uplog.add(o);
             }
         }
-        // 采集明细
-        List<OrderInstallDetail> od = orderInstallDetailService.lambdaQuery()
-                .eq(OrderInstallDetail::getOrderBaseId, orderBase.getId()).list();
-        for (OrderInstallDetail o:od){
-            if (org.apache.commons.lang3.StringUtils.isEmpty(o.getPgguid())){
-                o.setPgguid(orderBase.getPgguid());
-                updetail.add(o);
-            }
-        }
+
         // 预约改约-总部短信发送请求表
         List<FaGreeSms> fgs = faGreeSmsService.lambdaQuery()
                 .eq(FaGreeSms::getWorkerOrderNo, orderBase.getId())
@@ -1326,7 +1328,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         }
 
         // 管理端采集的条码图并没全部给到采集条码表中，这里需要转移到采集条码表中
-        upCodep(detail);
+        // upCodep(detail);
 
         // 处理条码明细 只有商用空调才处理
         if (!getDetailCodeCj(orderBase, detail, mainName, taskno, synReqId)){
@@ -1388,7 +1390,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 publicService.updateUploadTaskListInfo(synReqId,"order_install_detail_code.path未准备上传被忽略");
                 return Boolean.FALSE;
             }
-            // 条码上传
+            /*// 条码上传
             if (StringUtils.isEmpty(code.getGreeImageId())){
                 // 上传图片
                 if (!uploadImage(orderBase, code, synReqId)) {
@@ -1401,8 +1403,11 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 upCode.setId(code.getId());
                 upCode.setTmguid(UUID.randomUUID().toString());
                 orderInstallDetailCodeService.updateById(upCode);
-            }
-            // 采集明细表中取pgwcmxid
+            }*/
+
+
+
+            /*// 采集明细表中取pgwcmxid
             OrderInstallDetail orderInstallDetail = orderInstallDetailService.lambdaQuery()
                     .eq(OrderInstallDetail::getOrderBaseId,code.getOrderBaseId())
                     .eq(OrderInstallDetail::getId,code.getOrderDetailId())
@@ -1415,7 +1420,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 upCode.setId(code.getId());
                 upCode.setPgwcmxid(orderInstallDetail.getPgwcmxid());
                 orderInstallDetailCodeService.updateById(upCode);
-            }
+            }*/
 
             // 生成采集条码表数据
             if (!generateDetailCodeCj(orderBase, code, mainName, taskno)){
@@ -1487,11 +1492,11 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
     private Boolean generateDetailCodeCj(OrderBase orderBase, OrderInstallDetailCode code, String mainName, String taskno) {
-        // 采集条码表中的pgguid 统一改成工单基础表的pgguid
+        /*// 采集条码表中的pgguid 统一改成工单基础表的pgguid
         InstalDetailCode upcode = new InstalDetailCode();
         upcode.setOrderNo(code.getOrderBaseId());
         upcode.setPgguId(orderBase.getPgguid());
-        codeOrderInstallDetailMapper.updateCodePgguid(upcode);
+        codeOrderInstallDetailMapper.updateCodePgguid(upcode);*/
 
         InstalDetailCode codep = new InstalDetailCode();
         codep.setOrderNo(code.getOrderBaseId());
@@ -1521,8 +1526,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
     private Boolean getcjfjdataCj(OrderBase orderBase, OrderInstallDetail detail, String mainName, String taskno) {
-        String oldFile ="";
-        String newFile ="";
         // 安装工单采集附件表提取数据
         InstallCJDetailFile installCJDetailFile = new InstallCJDetailFile();
         installCJDetailFile.setOrderNo(detail.getOrderBaseId());
@@ -1536,18 +1539,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             }
             // 品牌方fileindex未获取上传被忽略
             if (StringUtils.isEmpty(file.getBrandFilePath())){
-                // 上传图片
-                oldFile = IdWorker.getIdStr() + ".jpeg";
-                baseService.saveToFile(ossUtil.getUrlWw(file.getFilePath()),oldFile);
-                // 获取文件
-                newFile = oldFile;
-                WebsitSH websitSH = publicService.ptshwdToshshwd(orderBase.getWebsitId(),orderBase.getMainId());
-                Boolean flag = uploadFileexc(newFile, oldFile,websitSH.getWdId(), file);
-                new File(newFile).delete();
-                // 生成图片失败不上传
-                if (!flag) {
-                    return Boolean.TRUE;
-                }
+                return Boolean.TRUE;
             }
             // 提取获取采集明细表数据中获取pgwcmxid(生成格力总部-采集明细序号)
             OrderInstallDetail detailone = orderInstallDetailService.lambdaQuery()
@@ -1622,21 +1614,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
     public Boolean getwgmxDataCj(String mainName, OrderDetailFile file, OrderInstallDetail detailone, String taskno) {
-        // 修改附件的pgwcmxid
-        if (detailone != null){
-            OrderDetailFile upf = new OrderDetailFile();
-            upf.setId(file.getId());
-            upf.setPgwcmxid(detailone.getPgwcmxid());
-            orderDetailFileService.updateById(upf);
-        }
-        // 修改附件的fjguid
-        if (detailone != null && StringUtils.isEmpty(file.getFjguid())){
-            OrderDetailFile upf = new OrderDetailFile();
-            upf.setId(file.getId());
-            upf.setFjguid(UUID.randomUUID().toString());
-            orderDetailFileService.updateById(upf);
-        }
-
         InstallCJDetailFile request = new InstallCJDetailFile();
         request.setOrderNo(file.getOrderBaseId());
         request.setId(file.getId());
@@ -1648,6 +1625,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             // 家用空调 完工明细 数据生成
             ItfTblAzWgmxJyktFjUpload jyktfj = fileOrderDetailMapper.getFileUploadCJ(request);
             if (jyktfj !=null){
+                // 修改类型对应关系
+                jyktfj.setType(setfjType(jyktfj.getType()));
                 if (!itfTblAzWgmxJyktFjUploadService.save(jyktfj)){
                     return Boolean.FALSE;
                 }
@@ -1660,6 +1639,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             // 商用空调 完工明细 数据生成
             ItfTblAzWgmxSyktFjUpload syktfj = fileOrderDetailMapper.getSyFileUploadCj(request);
             if (syktfj !=null){
+                // 修改类型对应关系
+                syktfj.setType(setfjType(syktfj.getType()));
                 if (!itfTblAzWgmxSyktFjUploadService.save(syktfj)){
                     return Boolean.FALSE;
                 }
@@ -1672,6 +1653,8 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             // 其他 完工明细 数据生成
             ItfTblAzWgmxQitaFjUpload otherfj = fileOrderDetailMapper.getOtherFileUploadCj(request);
             if (otherfj != null){
+                // 修改类型对应关系
+                otherfj.setType(setfjType(otherfj.getType()));
                 if (!itfTblAzWgmxQitaFjUploadService.save(otherfj)){
                     return Boolean.FALSE;
                 }