yaozhixue пре 1 година
родитељ
комит
5bcd25b8f2

+ 26 - 0
src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceDataUploadServiceImpl.java

@@ -1097,6 +1097,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         // 故障现象原因序
         upOrderRepairDetailReasonOutId(orderBase.getId());
 
+        // wxxmguid自生成
+        upOrderRepairDetailReasonwxxmguid(orderBase.getId());
+
         // 修改 维修现象主键、维修明细主键
         upOrderRepairDetailReason(orderBase.getId());
 
@@ -1213,6 +1216,29 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
         detaillist.clear();
     }
 
+    public void upOrderRepairDetailReasonwxxmguid(String orderBaseId) {
+        List<OrderRepairDetailReason> upList = new ArrayList<>();
+        // 查看是否有需要修改的数据
+        List<OrderRepairDetailReason> oids = orderRepairDetailReasonService.lambdaQuery()
+                .eq(OrderRepairDetailReason::getOrderBaseId, orderBaseId)
+                .eq(OrderRepairDetailReason::getWxxmguid, "")
+                .list();
+        if (CollectionUtils.isEmpty(oids)){
+            return;
+        }
+        for (OrderRepairDetailReason item:oids){
+            item.setWxxmguid(publicService.getUUID());
+            upList.add(item);
+        }
+
+        // 修改序
+        if (upList.size()>0){
+            orderRepairDetailReasonService.updateBatchById(upList);
+            upList.clear();
+        }
+        oids.clear();
+    }
+
 
     public Boolean checkOrderDetailFile(String id) {
         List<OrderDetailFile> detailFiles = new ArrayList<>();

+ 1 - 1
src/main/resources/mapper/ReasonOrderRepairDetailMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="getItfTblWxjsWxxmJyktUpload" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblWxjsWxxmJyktUpload">
         select a.out_id as fa_order_repair_data_info_id,
-               a.id as wxxmguid,'guangfo' as created_by,
+               a.wxxmguid 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,ifnull(a.repair_item_id,'') as wxxmh,