add

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

@@ -1086,9 +1086,6 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         // 修改序采集单内的序
         upOrderRepairDetail(orderBase.getId());
 
-        // 格力总部数据采集主键为空时代表为公司采集的数据，brandwxjsguid填写UUID
-        updateOrderRepairDetailWxjsguid(orderBase.getId());
-
         // 修改 wxjsmxguid
         updateOrderRepairDetailWxjsmxguid(orderBase);
 
@@ -1098,7 +1095,7 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         // 故障现象原因序
         upOrderRepairDetailReasonOutId(orderBase.getId());
 
-        // 故障现象Xxyyguid主键 wxxmguid自生成
+        // 故障现象Xxyyguid主键 wxjsguid 自生成
         upOrderRepairDetailReasonSetOther(orderBase.getId());
 
         // 修改 维修现象主键、维修明细主键
@@ -1114,17 +1111,32 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
     }
 
     private void updateOrderRepairDetailWxjsmxguid(OrderBase orderBase) {
+        Boolean f = Boolean.FALSE;
+
         List<OrderRepairDetail> upList = new ArrayList<>();
         // 看有无需要修改的数据
         List<OrderRepairDetail> detaillistz = orderRepairDetailService.lambdaQuery()
                 .eq(OrderRepairDetail::getOrderBaseId, orderBase.getId())
-                .eq(OrderRepairDetail::getWxjsmxguid, "").list();
+                .list();
         if (CollectionUtils.isEmpty(detaillistz)){
             return;
         }
         for (OrderRepairDetail i:detaillistz){
-            i.setWxjsmxguid(publicService.getUUID());
-            upList.add(i);
+            f = Boolean.FALSE;
+            if (StringUtils.isEmpty(i.getWxjsmxguid())){
+                i.setWxjsmxguid(publicService.getUUID());
+                f = Boolean.TRUE;
+
+            }
+            // 格力总部数据采集主键为空时代表为公司采集的数据，brandwxjsguid填写UUID
+            if (StringUtils.isEmpty(i.getBrandWxjsguid())){
+                i.setBrandWxjsguid(publicService.getUUID());
+                f = Boolean.TRUE;
+            }
+
+            if (f){
+                upList.add(i);
+            }
         }
         // 修改序
         if (upList.size()>0){
@@ -1234,7 +1246,6 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                 f = Boolean.TRUE;
             }
 
-
             if (f){
                 upList.add(ite);
             }
@@ -1293,29 +1304,6 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         return flag;
     }
 
-    public void updateOrderRepairDetailWxjsguid(String id) {
-        List<OrderRepairDetail> upList = new ArrayList<>();
-        // 看有无需要修改的数据
-        List<OrderRepairDetail> detaillistz = orderRepairDetailService.lambdaQuery()
-                .eq(OrderRepairDetail::getOrderBaseId, id)
-                .eq(OrderRepairDetail::getBrandWxjsguid, "").list();
-        if (CollectionUtils.isEmpty(detaillistz)){
-            return;
-        }
-        for (OrderRepairDetail i:detaillistz){
-            OrderRepairDetail u = new OrderRepairDetail();
-            MyBeanUtils.copyProperties(i,u);
-            u.setBrandWxjsguid(publicService.getUUID());
-            upList.add(u);
-        }
-        // 修改序
-        if (upList.size()>0){
-            orderRepairDetailService.updateBatchById(upList);
-            upList.clear();
-        }
-        detaillistz.clear();
-    }
-
     public Boolean checkFile(String orderNo, Long synReqId){
         InstallCJDetailFile installCJDetailFile = new InstallCJDetailFile();
         installCJDetailFile.setOrderNo(orderNo);