调整

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

@@ -42,7 +42,7 @@ public class BoilerTaskOrderPageReqVO extends PageParam {
     private Integer taskStatus;
 
     @Schema(description = "任务状态")
-    private String status;
+    private Integer status;
 
     @Schema(description = "检验日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

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

@@ -693,6 +693,24 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
         PageResult<BoilerTaskOrderRespVO> pageResult = new PageResult<>();
 
+        if (StringUtils.isNotEmpty(pageReqVO.getBpmUserId())) {
+            BpmProcessInstanceDTO bpmProcessInstanceDTO = new BpmProcessInstanceDTO();
+            bpmProcessInstanceDTO.setStatus(100);
+            if (pageReqVO.getStatus() != null) {
+                bpmProcessInstanceDTO.setStatus(pageReqVO.getStatus());
+            }
+            bpmProcessInstanceDTO.setProcessDefinitionKey(BpmModeConstantsEnum.TASK_ORDER.getType());
+            List<BpmProcessInstanceRespDTO> checkedData = bpmProcessInstanceApi.getProcessInstanceList(pageReqVO.getBpmUserId(), bpmProcessInstanceDTO).getCheckedData();
+            if (CollUtil.isNotEmpty(checkedData)) {
+                List<String> list = checkedData.stream().map(BpmProcessInstanceRespDTO::getId).toList();
+                if (CollUtil.isNotEmpty(list)) {
+                    pageReqVO.setProcessInstanceIds(list);
+                }
+            } else {
+                return PageResult.empty();
+            }
+        }
+
         List<BoilerTaskOrderRespVO> boilerTaskOrderRespVOS = boilerTaskOrderMapper.selectPage(pageReqVO);
 
         //部门

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

@@ -619,6 +619,24 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         PageResult<PipeTaskOrderRespVO> pageResult = new PageResult<>();
 
+        if (StringUtils.isNotEmpty(pageReqVO.getBpmUserId())) {
+            BpmProcessInstanceDTO bpmProcessInstanceDTO = new BpmProcessInstanceDTO();
+            bpmProcessInstanceDTO.setStatus(100);
+            if (pageReqVO.getStatus() != null) {
+                bpmProcessInstanceDTO.setStatus(pageReqVO.getStatus());
+            }
+            bpmProcessInstanceDTO.setProcessDefinitionKey(BpmModeConstantsEnum.TASK_ORDER.getType());
+            List<BpmProcessInstanceRespDTO> checkedData = bpmProcessInstanceApi.getProcessInstanceList(pageReqVO.getBpmUserId(), bpmProcessInstanceDTO).getCheckedData();
+            if (CollUtil.isNotEmpty(checkedData)) {
+                List<String> list = checkedData.stream().map(BpmProcessInstanceRespDTO::getId).toList();
+                if (CollUtil.isNotEmpty(list)) {
+                    pageReqVO.setProcessInstanceIds(list);
+                }
+            } else {
+                return PageResult.empty();
+            }
+        }
+
         List<PipeTaskOrderRespVO> TaskOrderRespVOS = pipeTaskOrderMapper.selectPage(pageReqVO);
 
         //部门