feat(检测录入、任务确认): 检测录入、任务确认、列表及查询增加检验部门。另：记录录入列表样式调整

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

@@ -35,6 +35,7 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitempart.vo.
 import cn.start.tz.module.pressure2.controller.admin.equipboilerscheduling.vo.BoilerDeleteTask;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeOrderItemPageRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeRecheckUserPageReqVO;
+import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderSyncReportVO;
 import cn.start.tz.module.pressure2.dal.dataobject.businessmemberrelation.BusinessMemberRelationDO;
 import cn.start.tz.module.pressure2.dal.dataobject.notificationformreport.NotificationformReportDO;
@@ -669,6 +670,10 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
         List<BoilerTaskOrderRespVO> boilerTaskOrderRespVOS = boilerTaskOrderMapper.selectPage(pageReqVO);
 
+        //部门
+        List<String> deptIds = boilerTaskOrderRespVOS.stream().map(BoilerTaskOrderRespVO::getDeptId).filter(Objects::nonNull).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+        Map<String, DeptRespDTO> deptMap = deptIds.isEmpty() ? new HashMap<>() : deptApi.getDeptMap(deptIds);
+
         //项目负责人
         List<String> userIds = new ArrayList<>(boilerTaskOrderRespVOS.stream().map(BoilerTaskOrderRespVO::getManagerId).filter(Objects::nonNull).toList());
         Map<String, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
@@ -683,6 +688,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                 List<AdminUserRespDTO> checkUsers = adminUserApi.getUserList(uIds).getData();
                 item.setAppoinmentUser(checkUsers);
             }
+
+            //部门
+            item.setDeptName(deptMap.get(item.getDeptId()).getName());
         });
 
         // 负责人
@@ -908,6 +916,10 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             wrapReportDoListInBoilerOrderItem(boilerOrderItemPageRespVOS);
         }
 
+        //部门
+        List<String> deptIds = boilerOrderItemPageRespVOS.stream().map(BoilerOrderItemPageRespVO::getDeptId).filter(Objects::nonNull).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+        Map<String, DeptRespDTO> deptMap = deptIds.isEmpty() ? new HashMap<>() : deptApi.getDeptMap(deptIds);
+
         // 处理人员信息
         List<String> userIds = new ArrayList<>(boilerOrderItemPageRespVOS.stream().map(BoilerOrderItemPageRespVO::getManagerId).filter(Objects::nonNull).toList());
         List<String> mainCheckerIds = new ArrayList<>(boilerOrderItemPageRespVOS.stream().map(BoilerOrderItemPageRespVO::getMainChecker).filter(Objects::nonNull).toList());
@@ -927,6 +939,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             }
             item.setIsClaim(StringUtils.isNotBlank(item.getMainChecker()));
 
+            //部门
+            item.setDeptName(deptMap.get(item.getDeptId()).getName());
+
             // 计算剩余期限：结束检验日期 +10 天 - 当前日期
             if (item.getEndCheckDate() == null){
                 item.setRemainingDays(10);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -588,6 +588,10 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         List<PipeTaskOrderRespVO> TaskOrderRespVOS = pipeTaskOrderMapper.selectPage(pageReqVO);
 
+        //部门
+        List<String> deptIds = TaskOrderRespVOS.stream().map(PipeTaskOrderRespVO::getDeptId).filter(Objects::nonNull).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+        Map<String, DeptRespDTO> deptMap = deptIds.isEmpty() ? new HashMap<>() : deptApi.getDeptMap(deptIds);
+
         //项目负责人
         List<String> userIds = new ArrayList<>(TaskOrderRespVOS.stream().map(PipeTaskOrderRespVO::getManagerId).filter(Objects::nonNull).toList());
         Map<String, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
@@ -600,6 +604,9 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                 List<AdminUserRespDTO> checkUsers = adminUserApi.getUserList(uIds).getData();
                 item.setAppoinmentUser(checkUsers);
             }
+
+            //部门
+            item.setDeptName(deptMap.get(item.getDeptId()).getName());
         });
 
         // 负责人
@@ -947,6 +954,11 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             wrapReportDoListInPipeOrderItem(pipeOrderItemPageRespVOS);
         }
 
+        //部门
+        List<String> deptIds = pipeOrderItemPageRespVOS.stream().map(PipeOrderItemPageRespVO::getDeptId).filter(Objects::nonNull).filter(StringUtils::isNotBlank).collect(Collectors.toList());
+        Map<String, DeptRespDTO> deptMap = deptIds.isEmpty() ? new HashMap<>() : deptApi.getDeptMap(deptIds);
+
+
         // 处理人员信息
         List<String> userIds = new ArrayList<>(pipeOrderItemPageRespVOS.stream().map(PipeOrderItemPageRespVO::getManagerId).filter(Objects::nonNull).toList());
         List<String> mainCheckerIds = new ArrayList<>(pipeOrderItemPageRespVOS.stream().map(PipeOrderItemPageRespVO::getMainChecker).filter(Objects::nonNull).toList());
@@ -966,6 +978,9 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             }
             item.setIsClaim(StringUtils.isNotBlank(item.getMainChecker()));
 
+            //部门
+            item.setDeptName(deptMap.get(item.getDeptId()).getName());
+
             //工程号
             if (StringUtil.isNotEmpty(item.getProjectNo())){
                 item.setProjectNoList(Arrays.stream(item.getProjectNo().split(",")).toList());

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/boilertaskorder/BoilerTaskOrderMapper.xml

@@ -23,6 +23,9 @@
                 <if test="checkType != null and checkType != ''">
                     AND bto.CHECK_TYPE = #{checkType}
                 </if>
+                <if test="deptId != null and deptId != ''">
+                    AND bto.DEPT_ID = #{deptId}
+                </if>
                 <if test="equipMainType != null and equipMainType != ''">
                     AND bto.EQUIP_MAIN_TYPE = #{equipMainType}
                 </if>
@@ -209,6 +212,7 @@
         ,eb.EQUIP_NAME
         ,eb.UNIT_NAME
         ,bto.CHECK_TYPE
+        ,bto.DEPT_ID
         ,btoir.TASK_STATUS
         ,bto.CHECK_DATE
         ,bto.MANAGER_ID
@@ -254,6 +258,9 @@
                 <if test="checkType != null and checkType != ''">
                     AND bto.CHECK_TYPE = #{checkType}
                 </if>
+                <if test="deptId != null and deptId != ''">
+                    AND bto.DEPT_ID = #{deptId}
+                </if>
                 <if test="orderId != null and orderId != ''">
                     AND bto.ID = #{orderId}
                 </if>

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/pipetaskorder/PipeTaskOrderMapper.xml

@@ -23,6 +23,9 @@
                 <if test="checkType != null and checkType != ''">
                     AND bto.CHECK_TYPE = #{checkType}
                 </if>
+                <if test="deptId != null and deptId != ''">
+                    AND bto.DEPT_ID = #{deptId}
+                </if>
                 <if test="checkDate != null and checkDate.size() >= 2">
                     AND bto.CHECK_DATE BETWEEN #{checkDate[0]} AND #{checkDate[1]}
                 </if>
@@ -155,6 +158,7 @@
             ,bto.ORDER_NO
             ,bto.UNIT_NAME
             ,bto.CHECK_TYPE
+            ,bto.DEPT_ID
             ,btoir.TASK_STATUS
             ,bto.CHECK_DATE
             ,bto.MANAGER_ID
@@ -204,6 +208,9 @@
                 <if test="checkType != null and checkType != ''">
                     AND bto.CHECK_TYPE = #{checkType}
                 </if>
+                <if test="deptId != null and deptId != ''">
+                    AND bto.DEPT_ID = #{deptId}
+                </if>
                 <if test="orderId != null and orderId != ''">
                     AND bto.ID = #{orderId}
                 </if>