add

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

@@ -1004,7 +1004,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                         (("cj".equals(cjOrWg) && detail.getIsCjSend().equals("NO")) ||
                                 ("wg".equals(cjOrWg) && detail.getIsWgSend().equals("NO")))) {
 
-log.info("测试信息a   id={} - {}",ojtutl.getSynReqId());
+log.info("测试信息a   id={} ",ojtutl.getSynReqId());
 
 
                     // 生成taskno,pgwcmxid 共用
@@ -1058,7 +1058,10 @@ log.info("测试信息a   id={} - {}",ojtutl.getSynReqId());
                 .eq(ItfTblazwgmxqita::getSynTaskNo,taskno).list();
         // 状态:3=临时保存;2=作废,1=已采集,0=未采集
 
+        log.info("测试信息b   id={}",ojtutl.getSynReqId());
+
         if (CollectionUtils.isNotEmpty(jys) || CollectionUtils.isNotEmpty(sys) || CollectionUtils.isNotEmpty(qts)){
+            log.info("测试信息 " );
             if ("cj".equals(cjOrWg)){
                 itemStatus = 1;
                 if (detail.getStatus().equals(1)){
@@ -1142,7 +1145,7 @@ log.info("测试信息a   id={} - {}",ojtutl.getSynReqId());
             }
         }
 
-        log.info("测试信息b   id={} - {}",ojtutl.getSynReqId());
+
 
         return Boolean.TRUE;
     }
@@ -1373,8 +1376,10 @@ log.info("测试信息a   id={} - {}",ojtutl.getSynReqId());
     public Boolean installDtailJS(String cjOrWg, Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,
                                    OrderInstallDetail detail, String taskno, String mainName,
                                    Long synReqId) {
+
+
         // 获取完工采集明细数据 (家用空调、商用空调、其他) TL_fa_order_install_detail_js
-        if (!getCJMXDataCj(cjOrWg, brand, orderBase, lcls, detail, mainName, taskno)){
+        if (!getCJMXDataCj(cjOrWg, brand, orderBase, lcls, detail, mainName, taskno,synReqId)){
             return Boolean.FALSE;
         }
         // 获取采集附件数据 (家用、商用、其他)  TL_fa_order_install_detail_append_js
@@ -1798,7 +1803,7 @@ log.info("测试信息a   id={} - {}",ojtutl.getSynReqId());
     }
 
     public Boolean getCJMXDataCj(String cjOrWg, Brand brand, OrderBase orderBase, ItfTblAzAssignLcLsUpload lcls,
-                                  OrderInstallDetail item, String mainName, String taskno) {
+                                  OrderInstallDetail item, String mainName, String taskno,Long synReqId) {
         /*if (org.apache.commons.lang3.StringUtils.isEmpty(item.getPgwcmxid())){
             item.setPgwcmxid(pgwcmxid);
             item.updateById();
@@ -1843,6 +1848,9 @@ log.info("测试信息a   id={} - {}",ojtutl.getSynReqId());
         } else if (mainName.equals("商用空调")){
             // 商用空调 完工明细数据生成(完工采集数据)
             ItfTblAzWgmxSyktUpload mxup = detailOrderInstallMapper.getSyOrderInstallUploadCj(request);
+
+            log.info("测试信息 xx    id={}",synReqId);
+
             if (mxup != null){
                 // 部分参数单独处理
                 setSyParm(orderBase, lcls, cjstat, mxup, brand);