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

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

@@ -41,6 +41,8 @@ public class BoilerMajorIssuesPageReqVO extends PageParam {
 
     private List<String> submitIds;
 
+    //不显示已通过的检验方案
+    private Integer notShowEndPlan;
 
     @Schema(description = "报告类型",required = true)
     private Integer reportType;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderreport/BoilerTaskOrderReportMapper.java

@@ -154,8 +154,10 @@ public interface BoilerTaskOrderReportMapper extends BaseMapperX<BoilerTaskOrder
         // 过滤作废的单
         recordDOMPJLambdaWrapper.ne(BoilerTaskOrderReportDO::getStatus, BpmTaskStatusEnum.CANCEL.getStatus());
 
-        // 过滤已通过的检验方案
-        recordDOMPJLambdaWrapper.ne(BoilerTaskOrderReportDO::getStatus, BpmTaskStatusEnum.APPROVE.getStatus());
+        if(reqVO.getNotShowEndPlan() != null && reqVO.getNotShowEndPlan() == 1){
+            // 过滤已通过的检验方案
+            recordDOMPJLambdaWrapper.ne(BoilerTaskOrderReportDO::getStatus, BpmTaskStatusEnum.APPROVE.getStatus());
+        }
 
         return selectJoinPage(reqVO,BoilerMajorIssuesPageRespVO.class, recordDOMPJLambdaWrapper);
     }

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

@@ -2585,6 +2585,11 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             Map<String, AdminUserRespDTO> userMap = adminUserApi.getUserMap(finalUids);
             pageResult.getList().forEach(item -> {
                 item.setSubmitUser(userMap.get(item.getSubmitId()));
+//                if (item.getCurrentAuditorId() != null){
+//                    item.setCurrentAuditor(userMap.get(item.getCurrentAuditorId()));
+//                }else{
+//                    item.setCurrentAuditor(userMap.get(item.getApprovalId()));
+//                }
                 item.setCurrentAuditor(userMap.get(item.getApprovalId()));
                 item.setOrderItemIds(dataMap.get(item.getId()));
             });
@@ -2654,6 +2659,11 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         //List<TaskOrderSignFileDO> finalTaskOrderSignFileDOs = taskOrderSignFileDOs;
         pageResult.getList().forEach(item -> {
             item.setSubmitUser(userMap.get(item.getSubmitId()));
+//            if (item.getCurrentAuditorId() != null){
+//                item.setCurrentAuditor(userMap.get(item.getCurrentAuditorId()));
+//            }else{
+//                item.setCurrentAuditor(userMap.get(item.getApprovalId()));
+//            }
             item.setCurrentAuditor(userMap.get(item.getApprovalId()));
             item.setOrderItemIds(dataMap.get(item.getId()));
 //            if (CollUtil.isNotEmpty(finalTaskOrderSignFileDOs)) {

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

@@ -2027,6 +2027,11 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         pageResult.getList().forEach(item -> {
             item.setSubmitUser(userMap.get(item.getSubmitId()));
+//            if (item.getCurrentAuditorId() != null){
+//                item.setCurrentAuditor(userMap.get(item.getCurrentAuditorId()));
+//            }else{
+//                item.setCurrentAuditor(userMap.get(item.getApprovalId()));
+//            }
             item.setCurrentAuditor(userMap.get(item.getApprovalId()));
             item.setOrderItemIds(dataMap.get(item.getId()));
         });
@@ -3099,56 +3104,6 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
     public Boolean opinionNotice(MajorIssuesSubmitVO majorIssuesSubmitVO) {
 
         String id = majorIssuesSubmitVO.getId();
-//        if (majorIssuesSubmitVO.getReportType() != null && majorIssuesSubmitVO.getReportType().intValue() == TaskOrderItemReportTypeEnum.INSPECTION_PLAN.getType()) {
-//            PipeTaskOrderReportDO itemReportDO = taskOrderReportMapper.selectById(id);
-//
-//            Map<String, List<String>> startUserSelectAssignees = new HashMap<>(Map.of());
-//            //审核
-//            startUserSelectAssignees.put("Activity_0f0yeat", majorIssuesSubmitVO.getAuditUserIds());
-//            if (itemReportDO.getReportType() == 600) {
-//                //审批
-//                startUserSelectAssignees.put("Activity_0akhfc1", majorIssuesSubmitVO.getApproveUserIds());
-//            }
-//
-//            String processInstanceId = bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
-//                    new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PipeBpmModelConstants.PRESSURE2_PIPE_INSPECTION_SCHEME)
-//                            .setBusinessKey(id).setStartUserSelectAssignees(startUserSelectAssignees)).getCheckedData();
-//            itemReportDO.setSubmitId(getLoginUserId());
-//            itemReportDO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
-//            itemReportDO.setProcessInstanceId(processInstanceId);
-//            itemReportDO.setTaskStatus(TaskOrderStatusEnum.REPORT_APPROVAL.getStatus());
-//            itemReportDO.setReportUrl(majorIssuesSubmitVO.getReportUrl());
-//            itemReportDO.setPrepareJson(majorIssuesSubmitVO.getPrepareJson());
-//            itemReportDO.setSubmitTime(LocalDateTime.now());
-//            if (StringUtils.isNotBlank(majorIssuesSubmitVO.getManualUrl())) {
-//                itemReportDO.setManualUrl(majorIssuesSubmitVO.getManualUrl());
-//                itemReportDO.setIsManual(true);
-//            }
-//            taskOrderReportMapper.updateById(itemReportDO);
-//
-//            if (StrUtil.isNotEmpty(itemReportDO.getProcessInstanceId())) {
-//                //获取旧的BOM流程信息
-//                List<BpmTaskRespDTO> taskRespDTOList = bpmTaskApi.getTaskListByProcessInstanceId(itemReportDO.getProcessInstanceId()).getCheckedData();
-//                if (!CollUtil.isEmpty(taskRespDTOList)) {
-//                    taskRespDTOList.forEach(taskRespDTO -> {
-//                        //存储旧的流程信息作为审核记录使用
-//                        BpmTaskInfoDO bpmTaskInfoDO = new BpmTaskInfoDO();
-//                        bpmTaskInfoDO.setBusinessId(itemReportDO.getId());
-//                        bpmTaskInfoDO.setBusinessType(1);
-//                        bpmTaskInfoDO.setProcessIntanceId(itemReportDO.getProcessInstanceId());
-//                        bpmTaskInfoDO.setName(taskRespDTO.getName());
-//                        bpmTaskInfoDO.setStatus(taskRespDTO.getStatus());
-//                        bpmTaskInfoDO.setReason(taskRespDTO.getReason());
-//                        if (!Objects.isNull(taskRespDTO.getAssigneeUser())) {
-//                            bpmTaskInfoDO.setAssigneeUser(JSONObject.toJSONString(taskRespDTO.getAssigneeUser()));
-//                        }
-//                        bpmTaskInfoDO.setCreateTime(taskRespDTO.getCreateTime());
-//                        bpmTaskInfoMapper.insert(bpmTaskInfoDO);
-//                    });
-//                }
-//            }
-//            return true;
-//        }
 
         PipeTaskOrderItemReportDO itemReportDO = taskOrderItemReportMapper.selectById(id);
         Map<String, Object> processInstanceVariables = new HashMap<>();