app，设备列表增加mainChecker参数，增加管道设备查询接口（根据orderId查找管道）

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerTaskOrderItemDetailVO.java

@@ -96,4 +96,7 @@ public class BoilerTaskOrderItemDetailVO {
     @Schema(description = "发放报告状态")
     private Integer isIssueReport;
 
+    @Schema(description = "主检人")
+    private String mainChecker;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeTaskOrderItemDetailVO.java

@@ -89,4 +89,6 @@ public class PipeTaskOrderItemDetailVO {
     @Schema(description = "发放报告状态")
     private Integer isIssueReport;
 
+    private String mainChecker;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/equippipe/AppApiEquipPipeController.java

@@ -15,6 +15,7 @@ import cn.start.tz.module.pressure2.controller.appapi.equippipe.dto.EquipPipeSaf
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.pressure2.service.equippipe.EquipPipeService;
 import com.alibaba.fastjson2.JSONObject;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -97,6 +98,14 @@ public class AppApiEquipPipeController {
         return success(equipPipeService.getEquipPipe(id));
     }
 
+    @GetMapping("/getByTaskOrderId")
+    @Operation(summary = "获得任务单关联的工程及其管道")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    //@PreAuthorize("@ss.hasPermission('pressure2:equip-pipe:query')")
+    public CommonResult<List<EquipPipeRespVO>> getEquipPipeListByTaskOrderId(@RequestParam("taskOrderId") String taskOrderId) throws JsonProcessingException {
+        return success(equipPipeService.getEquipPipeListByTaskOrderId(taskOrderId));
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得管道设备分页")
     //@PreAuthorize("@ss.hasPermission('pressure2:equip-pipe:query')")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/equippipe/EquipPipeMapper.java

@@ -18,6 +18,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.system.api.clientunit.dto.ClientUnitDTO;
 import cn.start.tz.module.system.api.dept.dto.DeptRespDTO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import cn.start.tz.module.pressure2.controller.admin.equippipe.vo.*;
@@ -183,4 +184,6 @@ public interface EquipPipeMapper extends BaseMapperX<EquipPipeDO> {
                 .eq(EquipPipeDO::getId, updateObj.getId())
         );
     }
+
+    List<EquipPipeDO> selectEquipPipeListByTaskOrderId(String taskOrderId);
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipe/EquipPipeService.java

@@ -88,4 +88,6 @@ public interface EquipPipeService extends IService<EquipPipeDO>  {
     Map<String, EquipPipeSaveReqVO> getEquipPipeByNo(List<String> projectNos);
 
     void updateSafetyManager(@Valid EquipPipeSafetyManagerReqVO updateReqVO);
+
+    List<EquipPipeRespVO> getEquipPipeListByTaskOrderId(String taskOrderId) throws JsonProcessingException;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipe/EquipPipeServiceImpl.java

@@ -22,6 +22,7 @@ import cn.start.tz.module.pressure2.dal.mysql.equippipedetail.EquipPipeDetailMap
 import cn.start.tz.module.pressure2.dal.mysql.pipeequipmentoperationrecord.PipeEquipmentOperationRecordMapper;
 import cn.start.tz.module.pressure2.service.equippipedetail.EquipPipeDetailService;
 import cn.start.tz.module.pressure2.service.pipeequipmentoperationrecord.PipeEquipmentOperationRecordService;
+import cn.start.tz.module.pressure2.service.pipetaskorderitem.PipeTaskOrderItemService;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson2.JSONObject;
@@ -37,10 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static cn.start.tz.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -289,4 +287,26 @@ public class EquipPipeServiceImpl extends ServiceImpl<EquipPipeMapper, EquipPipe
         equipPipeMapper.updateById(equipPipeDO);
     }
 
+    @Override
+    public List<EquipPipeRespVO> getEquipPipeListByTaskOrderId(String taskOrderId) throws JsonProcessingException {
+        List<EquipPipeDO> equipPipeDOS = equipPipeMapper.selectEquipPipeListByTaskOrderId(taskOrderId);
+        List<EquipPipeRespVO> equipPipeRespVOS = new ArrayList<>();
+        for (EquipPipeDO equipPipeDO : equipPipeDOS) {
+            EquipPipeRespVO equipPipeRespVO = new EquipPipeRespVO();
+            BeanUtils.copyProperties(equipPipeDO, equipPipeRespVO);
+            equipPipeRespVO.setDetailSaveReqVOS(new ArrayList<>());
+            equipPipeRespVOS.add(equipPipeRespVO);
+        }
+        HashMap<String, EquipPipeRespVO> idToEquipPipeMap = new HashMap<>();
+        for (EquipPipeRespVO equipPipeRespVO : equipPipeRespVOS) {
+            idToEquipPipeMap.put(equipPipeRespVO.getId(), equipPipeRespVO);
+        }
+        List<EquipPipeDetailRespVO> equipPipeDetailRespVOS = equipPipeDetailService.selectListByEquipPipeIdCollection(idToEquipPipeMap.keySet());
+        for (EquipPipeDetailRespVO equipPipeDetailRespVO : equipPipeDetailRespVOS) {
+            EquipPipeRespVO equipPipeRespVO = idToEquipPipeMap.get(equipPipeDetailRespVO.getEquipPipeId());
+            equipPipeRespVO.getDetailSaveReqVOS().add(equipPipeDetailRespVO);
+        }
+        return equipPipeRespVOS;
+    }
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipedetail/EquipPipeDetailService.java

@@ -76,4 +76,6 @@ public interface EquipPipeDetailService extends IService<EquipPipeDetailDO>  {
      * @return 管道设备明细-管线
      */
     List<EquipPipeDetailRespVO> getEquipPipeDetailByEquipPipeId(String equipPipeId);
+
+    List<EquipPipeDetailRespVO> selectListByEquipPipeIdCollection(Set<String> equipPipeIds);
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipedetail/EquipPipeDetailServiceImpl.java

@@ -8,6 +8,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.util.*;
+
 import cn.start.tz.module.pressure2.controller.admin.equippipedetail.vo.*;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipedetail.EquipPipeDetailDO;
 import cn.start.tz.framework.common.pojo.PageResult;
@@ -99,4 +100,15 @@ public class EquipPipeDetailServiceImpl extends ServiceImpl<EquipPipeDetailMappe
         return BeanUtils.toBean(list, EquipPipeDetailRespVO.class);
     }
 
+    @Override
+    public List<EquipPipeDetailRespVO> selectListByEquipPipeIdCollection(Set<String> equipPipeIds) {
+        if (equipPipeIds == null || equipPipeIds.isEmpty()) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<EquipPipeDetailDO> lqw = new LambdaQueryWrapper<EquipPipeDetailDO>()
+                .in(EquipPipeDetailDO::getEquipPipeId, equipPipeIds);
+        List<EquipPipeDetailDO> list = equipPipeDetailMapper.selectList(lqw);
+        return BeanUtils.toBean(list, EquipPipeDetailRespVO.class);
+    }
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/boilertaskorderitem/BoilerTaskOrderItemMapper.xml

@@ -16,7 +16,7 @@
                 eb.MAX_CONTINUE_EVAPOR,eb.TONNAGE,eb.BOILER_MODEL,eb.NEXT_IN_CHECK_DATE,
                 eb.NEXT_OUT_CHECK_DATE,eb.NEXT_PRESSURE_CHECK_DATE,eb.CONTACT,eb.CONTACT_PHONE,eb.USE_REGISTER_NO as USE_CODE
                 ,btoir.TASK_STATUS,eb.type
-                ,eb.USE_REGISTER_NO,eb.EQUIP_NAME,tot.IS_ISSUE_REPORT
+                ,eb.USE_REGISTER_NO,eb.EQUIP_NAME,tot.IS_ISSUE_REPORT, tot.MAIN_CHECKER
             from PRESSURE2_BOILER_TASK_ORDER_ITEM tot
             left join PRESSURE2_EQUIP_BOILER eb on tot.EQUIP_ID = eb.ID
             left join PRESSURE_TASK_ORDER bto on tot.ORDER_ID = bto.ID and bto.EQUIP_MAIN_TYPE = 200

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/equippipe/EquipPipeMapper.xml

@@ -686,4 +686,11 @@
         </where>
     </select>
 
+    <select id="selectEquipPipeListByTaskOrderId">
+        SELECT pep.*
+        FROM PRESSURE2_PIPE_TASK_ORDER_ITEM pptoi
+        JOIN PRESSURE2_EQUIP_PIPE pep ON pep.ID = pptoi.EQUIP_ID
+        WHERE pptoi.DELETED = 0
+        AND pptoi.ORDER_ID = #{taskOrderId}
+    </select>
 </mapper>

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/pipetaskorderitem/PipeTaskOrderItemMapper.xml

@@ -16,7 +16,7 @@
         eb.NEXT_LEGAL_CHECK_DATE,eb.NEXT_YEAR_CHECK_DATE,
         eb.CONTACT,eb.CONTACT_PHONE,eb.PROJECT_NO,eb.PROJECT_NAME,eb.PIPE_CATEGORY
         ,btoir.TASK_STATUS,tot.IS_ISSUE_REPORT
-        ,eb.PROJECT_NAME as EQUIP_NAME,eb.CERTIFICATE_NO as USE_REGISTER_NO,eb.PROJECT_NO as EQUIP_CODE
+        ,eb.PROJECT_NAME as EQUIP_NAME,eb.CERTIFICATE_NO as USE_REGISTER_NO,eb.PROJECT_NO as EQUIP_CODE, tot.MAIN_CHECKER
         from PRESSURE2_PIPE_TASK_ORDER_ITEM tot
         left join PRESSURE2_EQUIP_PIPE eb on tot.EQUIP_ID = eb.ID
         left join PRESSURE_TASK_ORDER bto on tot.ORDER_ID = bto.ID and bto.EQUIP_MAIN_TYPE = 300