add

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

@@ -24,6 +24,7 @@ import com.zfire.jiasm.syncdata.response.ResultData;
 import com.zfire.jiasm.syncdata.response.WebsitSH;
 import com.zfire.jiasm.syncdata.service.PublicService;
 import com.zfire.jiasm.syncdata.service.RepairProduceDataUploadService;
+import com.zfire.jiasm.syncdata.test;
 import com.zfire.jiasm.syncdata.utils.*;
 import com.zfire.jiasm.syncdata.utils.oss.OSSUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -1097,8 +1098,8 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         // 故障现象原因序
         upOrderRepairDetailReasonOutId(orderBase.getId());
 
-        // wxxmguid自生成
-        upOrderRepairDetailReasonwxxmguid(orderBase.getId());
+        // 故障现象Xxyyguid主键 wxxmguid自生成
+        upOrderRepairDetailReasonSetOther(orderBase.getId());
 
         // 修改 维修现象主键、维修明细主键
         upOrderRepairDetailReason(orderBase.getId());
@@ -1200,11 +1201,6 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
             if (ite.getOutId() == 0){
                 outId++;
                 ite.setOutId(outId);
-                ite.setXxyyguid(publicService.getUUID());
-                if (StringUtils.isEmpty(ite.getWxjsguid())){
-                    ite.setWxjsguid(publicService.getUUID());
-                }
-
                 upList.add(ite);
             }
         }
@@ -1216,6 +1212,41 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         detaillist.clear();
     }
 
+    public void upOrderRepairDetailReasonSetOther (String orderBaseId) {
+        Boolean f = Boolean.FALSE;
+        List<OrderRepairDetailReason> upList = new ArrayList<>();
+        // 查看是否有需要修改的数据
+        List<OrderRepairDetailReason> oids = orderRepairDetailReasonService.lambdaQuery()
+                .eq(OrderRepairDetailReason::getOrderBaseId, orderBaseId)
+                .list();
+        if (CollectionUtils.isEmpty(oids)){
+            return;
+        }
+
+        for (OrderRepairDetailReason ite:oids){
+            f = Boolean.FALSE;
+            if (StringUtils.isEmpty(ite.getXxyyguid())){
+                ite.setXxyyguid(publicService.getUUID());
+                f = Boolean.TRUE;
+            }
+            if (StringUtils.isEmpty(ite.getWxjsguid())){
+                ite.setWxjsguid(publicService.getUUID());
+                f = Boolean.TRUE;
+            }
+
+
+            if (f){
+                upList.add(ite);
+            }
+        }
+        // 修改
+        if (upList.size()>0){
+            orderRepairDetailReasonService.updateBatchById(upList);
+            upList.clear();
+        }
+        oids.clear();
+    }
+
     public void upOrderRepairDetailReasonwxxmguid(String orderBaseId) {
         List<OrderRepairDetailReason> upList = new ArrayList<>();
         // 查看是否有需要修改的数据