浏览代码

锅炉认领后修改检验员

xy 5 天之前
父节点
当前提交
464021ca58

+ 23 - 7
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -417,9 +417,6 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
     @Resource
     private BoilerConnectRecordReportService boilerConnectRecordReportService;
 
-    @Resource
-    private BoilerTaskOrderItemReportUserMapper boilerTaskOrderItemReportUserMapper;
-
     @Resource
     private DynamicTbInsService dynamicTbInsService;
 
@@ -930,7 +927,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                     BoilerTaskOrderItemReportUserDO userDO = new BoilerTaskOrderItemReportUserDO();
                     userDO.setUserId(getLoginUserId());
                     userDO.setReportId(item.getId());
-                    boilerTaskOrderItemReportUserMapper.insert(userDO);
+                    taskOrderItemReportUserMapper.insert(userDO);
 
                     //生成 报表数据
                     BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
@@ -1032,6 +1029,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
     }
 
     @Override
+    @Transactional
     public Boolean orderItemClaim(BoilerOrderItemClaimVO orderItemIdVO) {
 
         BoilerTaskOrderItemDO taskOrderItemDO = boilerTaskOrderItemMapper.selectOne(BoilerTaskOrderItemDO::getId, orderItemIdVO.getId());
@@ -1047,6 +1045,24 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         taskOrderItem.setMainChecker(getLoginUserId());
         boilerTaskOrderItemMapper.updateById(taskOrderItem);
 
+        //认领时修改所有检验项目的检验员
+        List<BoilerTaskOrderItemReportDO> reportDOList = taskOrderItemReportMapper.selectList(BoilerTaskOrderItemReportDO::getOrderItemId, orderItemIdVO.getId());
+        if (!reportDOList.isEmpty()){
+            List<String> reportIds = reportDOList.stream().map(BoilerTaskOrderItemReportDO::getId).toList();
+            taskOrderItemReportUserMapper.delete(new LambdaQueryWrapperX<BoilerTaskOrderItemReportUserDO>()
+                    .in(BoilerTaskOrderItemReportUserDO::getReportId, reportIds));
+            List<BoilerTaskOrderItemReportUserDO> reportUserDOList = new ArrayList<>();
+            reportDOList.forEach(reportDO -> {
+
+                BoilerTaskOrderItemReportUserDO reportUserDO = new BoilerTaskOrderItemReportUserDO();
+                reportUserDO.setUserId(getLoginUserId());
+                reportUserDO.setReportId(reportDO.getId());
+                reportUserDOList.add(reportUserDO);
+
+            });
+            taskOrderItemReportUserMapper.insertBatch(reportUserDOList);
+        }
+
         //认领时同步报表
         syncAllReportDataByOrderItemId(new BoilerTaskOrderSyncReportVO().setOrderItemId(orderItemIdVO.getId()));
 
@@ -1929,7 +1945,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                             userDO.setUserId(reportDO.getCreator());
                         }
                         userDO.setReportId(item.getId());
-                        boilerTaskOrderItemReportUserMapper.insert(userDO);
+                        taskOrderItemReportUserMapper.insert(userDO);
 
                     });
                     itemReportDO.setReportNo(reportNo);
@@ -4169,7 +4185,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         BoilerTaskOrderItemReportUserDO userDO = new BoilerTaskOrderItemReportUserDO();
         userDO.setUserId(getLoginUserId());
         userDO.setReportId(addReport.getId());
-        boilerTaskOrderItemReportUserMapper.insert(userDO);
+        taskOrderItemReportUserMapper.insert(userDO);
 
         //生成 报表数据
         BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
@@ -6179,7 +6195,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                 item.setBeDistrictName(AreaUtils.getArea(item.getBeDistrict()).getName());
             }
 
-            List<BoilerTaskOrderItemReportUserDO> taskOrderUserDOList = boilerTaskOrderItemReportUserMapper.selectList(BoilerTaskOrderItemReportUserDO::getReportId, item.getReportId());
+            List<BoilerTaskOrderItemReportUserDO> taskOrderUserDOList = taskOrderItemReportUserMapper.selectList(BoilerTaskOrderItemReportUserDO::getReportId, item.getReportId());
             List<String> uIds = new ArrayList<>(taskOrderUserDOList.stream().map(BoilerTaskOrderItemReportUserDO::getUserId).toList());
             if (!uIds.isEmpty()) {
                 List<AdminUserRespDTO> checkUsers = adminUserApi.getUserList(uIds).getData();