Merge remote-tracking branch 'origin/dev' into dev

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/boilertaskordersecuritycheck/AppApiBoilerTaskOrderSecurityCheckController.java

@@ -76,7 +76,7 @@ public class AppApiBoilerTaskOrderSecurityCheckController {
     @Operation(summary = "获得安全检查记录分页")
     //@PreAuthorize("@ss.hasPermission('pressure:task-order-security-check:query')")
     public CommonResult<PageResult<BoilerTaskOrderSecurityCheckRespVO>> getTaskOrderSecurityCheckPage(@Valid BoilerTaskOrderSecurityCheckPageReqVO pageReqVO) {
-        PageResult<BoilerTaskOrderSecurityCheckRespVO> pageResult = boilerTaskOrderSecurityCheckService.getTaskOrderSecurityCheckPage(pageReqVO);
+        PageResult<BoilerTaskOrderSecurityCheckRespVO> pageResult = boilerTaskOrderSecurityCheckService.getAppTaskOrderSecurityCheckPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, BoilerTaskOrderSecurityCheckRespVO.class));
     }
 /*

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/appapi/pipetaskordersecuritycheck/AppApiPipeTaskOrderSecurityCheckController.java

@@ -74,7 +74,7 @@ public class AppApiPipeTaskOrderSecurityCheckController {
     @Operation(summary = "获得管道安全检查记录分页")
     //@PreAuthorize("@ss.hasPermission('pressure2:pipe-task-order-security-check:query')")
     public CommonResult<PageResult<PipeTaskOrderSecurityCheckRespVO>> getPipeTaskOrderSecurityCheckPage(@Valid PipeTaskOrderSecurityCheckPageReqVO pageReqVO) {
-        PageResult<PipeTaskOrderSecurityCheckRespVO> pageResult = pipeTaskOrderSecurityCheckService.getTaskOrderSecurityCheckPage(pageReqVO);
+        PageResult<PipeTaskOrderSecurityCheckRespVO> pageResult = pipeTaskOrderSecurityCheckService.getAppTaskOrderSecurityCheckPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, PipeTaskOrderSecurityCheckRespVO.class));
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskordersignfile/BoilerTaskOrderSignFileMapper.java

@@ -68,4 +68,13 @@ public interface BoilerTaskOrderSignFileMapper extends BaseMapperX<BoilerTaskOrd
         lwqx.in(BoilerTaskOrderSignFileDO::getOrderId, orderIds);
         return selectList(lwqx);
     }
+
+    default List<BoilerTaskOrderSignFileDO> selectListBySecurityIdCollection(Collection<String> securityIds) {
+        if (securityIds == null || securityIds.isEmpty()) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapperX<BoilerTaskOrderSignFileDO> lwqx = new LambdaQueryWrapperX<>();
+        lwqx.in(BoilerTaskOrderSignFileDO::getSecurityCheckId, securityIds);
+        return selectList(lwqx);
+    }
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskordersecuritycheck/BoilerTaskOrderSecurityCheckService.java

@@ -57,6 +57,7 @@ public interface BoilerTaskOrderSecurityCheckService {
      * @return 安全检查记录分页
      */
     PageResult<BoilerTaskOrderSecurityCheckRespVO> getTaskOrderSecurityCheckPage(BoilerTaskOrderSecurityCheckPageReqVO pageReqVO);
+    PageResult<BoilerTaskOrderSecurityCheckRespVO> getAppTaskOrderSecurityCheckPage(BoilerTaskOrderSecurityCheckPageReqVO pageReqVO);
 /*
     ByteArrayOutputStream getRecordOutputStreamReport(String id, Integer fileType) throws Exception;*/
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskordersecuritycheck/BoilerTaskOrderSecurityCheckServiceImpl.java

@@ -19,6 +19,7 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskordersecuritychec
 import cn.start.tz.module.pressure2.controller.admin.boilertaskordersecuritycheck.vo.BoilerTaskOrderSecurityCheckSaveReqVO;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilerconnecttbservice.BoilerConnectTbServiceDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersignfile.BoilerTaskOrderSignFileDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictb.DynamicTbDO;
 import cn.start.tz.module.pressure2.dal.dataobject.reporttemplate.ReportTemplateDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrderDO;
@@ -27,6 +28,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreportvers
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersecuritycheck.BoilerTaskOrderSecurityCheckDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderuser.BoilerTaskOrderUserDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilerconnecttbservice.BoilerConnectTbServiceMapper;
+import cn.start.tz.module.pressure2.dal.mysql.boilertaskordersignfile.BoilerTaskOrderSignFileMapper;
 import cn.start.tz.module.pressure2.dal.mysql.dynamictb.DynamicTbMapper;
 import cn.start.tz.module.pressure2.dal.mysql.reporttemplate.ReportTemplateMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorder.BoilerTaskOrderMapper;
@@ -108,6 +110,9 @@ public class BoilerTaskOrderSecurityCheckServiceImpl implements BoilerTaskOrderS
     @Resource
     private GrapeCityApi grapeCityApi;
 
+    @Resource
+    private BoilerTaskOrderSignFileMapper taskOrderSignFileMapper;
+
 
     @Resource
     private ObjectMapper objectMapper;
@@ -238,6 +243,24 @@ public class BoilerTaskOrderSecurityCheckServiceImpl implements BoilerTaskOrderS
     public PageResult<BoilerTaskOrderSecurityCheckRespVO> getTaskOrderSecurityCheckPage(BoilerTaskOrderSecurityCheckPageReqVO pageReqVO) {
         return taskOrderSecurityCheckMapper.selectJoinPage(pageReqVO);
     }
+
+    @Override
+    public PageResult<BoilerTaskOrderSecurityCheckRespVO> getAppTaskOrderSecurityCheckPage(BoilerTaskOrderSecurityCheckPageReqVO pageReqVO) {
+        PageResult<BoilerTaskOrderSecurityCheckRespVO> boilerTaskOrderSecurityCheckRespVOPageResult = getTaskOrderSecurityCheckPage(pageReqVO);
+        List<BoilerTaskOrderSecurityCheckRespVO> list = boilerTaskOrderSecurityCheckRespVOPageResult.getList();
+        Map<String, BoilerTaskOrderSecurityCheckRespVO> idToEntityMap = new HashMap<>();
+        for (BoilerTaskOrderSecurityCheckRespVO boilerTaskOrderSecurityCheckRespVO : list) {
+            idToEntityMap.put(boilerTaskOrderSecurityCheckRespVO.getId(), boilerTaskOrderSecurityCheckRespVO);
+        }
+        List<BoilerTaskOrderSignFileDO> boilerTaskOrderSignFileDOS = taskOrderSignFileMapper.selectListBySecurityIdCollection(idToEntityMap.keySet());
+        for (BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO : boilerTaskOrderSignFileDOS) {
+            BoilerTaskOrderSecurityCheckRespVO boilerTaskOrderSecurityCheckRespVO = idToEntityMap.get(boilerTaskOrderSignFileDO.getSecurityCheckId());
+            if (boilerTaskOrderSecurityCheckRespVO != null) {
+                boilerTaskOrderSecurityCheckRespVO.setIsSign(true);
+            }
+        }
+        return boilerTaskOrderSecurityCheckRespVOPageResult;
+    }
 /*
     @Override
     public ByteArrayOutputStream getRecordOutputStreamReport(String id, Integer fileType) throws Exception {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskordersecuritycheck/PipeTaskOrderSecurityCheckService.java

@@ -61,10 +61,12 @@ public interface PipeTaskOrderSecurityCheckService extends IService<PipeTaskOrde
     PageResult<PipeTaskOrderSecurityCheckDO> getPipeTaskOrderSecurityCheckPage(PipeTaskOrderSecurityCheckPageReqVO pageReqVO);
 
     PageResult<PipeTaskOrderSecurityCheckRespVO> getTaskOrderSecurityCheckPage(PipeTaskOrderSecurityCheckPageReqVO pageReqVO);
+    PageResult<PipeTaskOrderSecurityCheckRespVO> getAppTaskOrderSecurityCheckPage(PipeTaskOrderSecurityCheckPageReqVO pageReqVO);
 
     BoilerTaskOrderSecurityCheckReportVO getDefaultTemplate(String orderId) throws JsonProcessingException;
 
     void updateTaskOrderSecurityCheckByOrderId(OrderFormEnterReqVO reqVO);
 
     void updateTaskOrderSecurityCheck(@Valid PipeTaskOrderSecurityCheckSaveReqVO updateReqVO);
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskordersecuritycheck/PipeTaskOrderSecurityCheckServiceImpl.java

@@ -14,9 +14,11 @@ import cn.start.tz.module.pressure2.controller.admin.pipetaskordersecuritycheck.
 import cn.start.tz.module.pressure2.controller.admin.pipetaskordersecuritycheck.vo.PipeTaskOrderSecurityCheckSaveReqVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilerconnecttbservice.BoilerConnectTbServiceDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersecuritycheck.BoilerTaskOrderSecurityCheckDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersignfile.BoilerTaskOrderSignFileDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictb.DynamicTbDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskordersecuritycheck.PipeTaskOrderSecurityCheckDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilerconnecttbservice.BoilerConnectTbServiceMapper;
+import cn.start.tz.module.pressure2.dal.mysql.boilertaskordersignfile.BoilerTaskOrderSignFileMapper;
 import cn.start.tz.module.pressure2.dal.mysql.dynamictb.DynamicTbMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskordersecuritycheck.PipeTaskOrderSecurityCheckMapper;
 import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
@@ -34,6 +36,7 @@ import org.springframework.validation.annotation.Validated;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -66,6 +69,9 @@ public class PipeTaskOrderSecurityCheckServiceImpl extends ServiceImpl<PipeTaskO
     @Resource
     private BoilerConnectTbServiceMapper boilerConnectTbServiceMapper;
 
+    @Resource
+    private BoilerTaskOrderSignFileMapper taskOrderSignFileMapper;
+
     @Override
     public String createPipeTaskOrderSecurityCheck(PipeTaskOrderSecurityCheckSaveReqVO createReqVO) {
 
@@ -165,6 +171,24 @@ public class PipeTaskOrderSecurityCheckServiceImpl extends ServiceImpl<PipeTaskO
         return pipeTaskOrderSecurityCheckMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public PageResult<PipeTaskOrderSecurityCheckRespVO> getAppTaskOrderSecurityCheckPage(PipeTaskOrderSecurityCheckPageReqVO pageReqVO) {
+        PageResult<PipeTaskOrderSecurityCheckRespVO> taskOrderSecurityCheckPage = getTaskOrderSecurityCheckPage(pageReqVO);
+        List<PipeTaskOrderSecurityCheckRespVO> list = taskOrderSecurityCheckPage.getList();
+        Map<String, PipeTaskOrderSecurityCheckRespVO> idToEntityMap = new HashMap<>();
+        for (PipeTaskOrderSecurityCheckRespVO pipeTaskOrderSecurityCheckRespVO : list) {
+            idToEntityMap.put(pipeTaskOrderSecurityCheckRespVO.getId(), pipeTaskOrderSecurityCheckRespVO);
+        }
+        List<BoilerTaskOrderSignFileDO> taskOrderSignFileDOS = taskOrderSignFileMapper.selectListBySecurityIdCollection(idToEntityMap.keySet());
+        for (BoilerTaskOrderSignFileDO taskOrderSignFileDO : taskOrderSignFileDOS) {
+            PipeTaskOrderSecurityCheckRespVO pipeTaskOrderSecurityCheckRespVO = idToEntityMap.get(taskOrderSignFileDO.getSecurityCheckId());
+            if (pipeTaskOrderSecurityCheckRespVO != null) {
+                pipeTaskOrderSecurityCheckRespVO.setIsSign(true);
+            }
+        }
+        return taskOrderSecurityCheckPage;
+    }
+
     @Override
     public PageResult<PipeTaskOrderSecurityCheckRespVO> getTaskOrderSecurityCheckPage(PipeTaskOrderSecurityCheckPageReqVO pageReqVO) {
         return pipeTaskOrderSecurityCheckMapper.selectJoinPage(pageReqVO);