问题调整

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

@@ -100,4 +100,6 @@ public class BoilerMajorIssuesPageRespVO {
     private String projectNo;
 
     private String manualUrl;
+
+    private String approvalId;
 }

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

@@ -43,6 +43,9 @@ public class BoilerTaskOrderEquipsPageReqVO extends PageParam {
     @Schema(description = "锅炉类型")
     private List<String> typeList;
 
+    @Schema(description = "使用状态")
+    private List<Integer> useStatus;
+
     @Schema(description = "临检时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private List<LocalDateTime> nextDate;

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

@@ -12,6 +12,8 @@ public class PipeTaskOrderAuditUpdateVO extends PipeTaskOrderSaveReqVO {
     @Schema(description = "人员")
     private List<String> userList ;
 
+    @Schema(description = "人员")
+    private List<BoilerOrderTeamItemVO> teamItemList ;
 
     @Schema(description = "设备列表")
     private List<PipeTaskOrderItemAuditUpdateVO> orderItems ;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderoperation/BoilerTaskOrderOperationMapper.java

@@ -30,7 +30,7 @@ public interface BoilerTaskOrderOperationMapper extends BaseMapperX<BoilerTaskOr
                 .eqIfPresent(BoilerTaskOrderOperationDO::getContractNo, reqVO.getContractNo())
                 .eqIfPresent(BoilerTaskOrderOperationDO::getChangeType, reqVO.getChangeType())
                 .eqIfPresent(BoilerTaskOrderOperationDO::getAuditorId, reqVO.getAuditorId())
-                .orderByDesc(BoilerTaskOrderOperationDO::getId));
+                .orderByDesc(BoilerTaskOrderOperationDO::getCreateTime));
     }
 
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/pipetaskorderoperation/PipeTaskOrderOperationMapper.java

@@ -5,6 +5,7 @@ import java.util.*;
 import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.framework.mybatis.core.mapper.BaseMapperX;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderoperation.BoilerTaskOrderOperationDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderoperation.PipeTaskOrderOperationDO;
 import org.apache.ibatis.annotations.Mapper;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderoperation.vo.*;
@@ -30,7 +31,7 @@ public interface PipeTaskOrderOperationMapper extends BaseMapperX<PipeTaskOrderO
                 .eqIfPresent(PipeTaskOrderOperationDO::getContractNo, reqVO.getContractNo())
                 .eqIfPresent(PipeTaskOrderOperationDO::getChangeType, reqVO.getChangeType())
                 .eqIfPresent(PipeTaskOrderOperationDO::getAuditorId, reqVO.getAuditorId())
-                .orderByDesc(PipeTaskOrderOperationDO::getId));
+                .orderByDesc(PipeTaskOrderOperationDO::getCreateTime));
     }
 
 }

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

@@ -2080,7 +2080,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                 }
 
                 // 只有报告
-                if (connectDO.getRecordTemplateId() == null){
+                if (connectDO != null && connectDO.getRecordTemplateId() == null){
                     addReport.setTaskStatus(TaskOrderStatusEnum.REPORT_PREPARE.getStatus());
                     addReport.setReportTemplateId(connectDO.getReportTemplateId());
                     addReport.setTemplateId(null);
@@ -2489,7 +2489,10 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             if (pageResult.getList() == null || pageResult.getList().isEmpty()) {
                 return PageResult.empty();
             }
-            List<String> uids = pageResult.getList().stream().map(BoilerMajorIssuesPageRespVO::getSubmitId).filter(Objects::nonNull).toList();
+
+            List<String> uids = new ArrayList<>(pageResult.getList().stream().map(BoilerMajorIssuesPageRespVO::getSubmitId).filter(Objects::nonNull).toList());
+            List<String> uidApprovals = pageResult.getList().stream().map(BoilerMajorIssuesPageRespVO::getApprovalId).filter(Objects::nonNull).toList();
+            uids.addAll(uidApprovals);
 
             List<String> finalUids = new ArrayList<>(uids);
             List<String> processInstanceIds = pageResult.getList().stream().map(BoilerMajorIssuesPageRespVO::getProcessInstanceId).filter(Objects::nonNull).toList();
@@ -2523,7 +2526,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             Map<String, AdminUserRespDTO> userMap = adminUserApi.getUserMap(finalUids);
             pageResult.getList().forEach(item -> {
                 item.setSubmitUser(userMap.get(item.getSubmitId()));
-                item.setCurrentAuditor(userMap.get(item.getCurrentAuditorId()));
+                item.setCurrentAuditor(userMap.get(item.getApprovalId()));
                 item.setOrderItemIds(dataMap.get(item.getId()));
             });
 
@@ -2545,7 +2548,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             return PageResult.empty();
         }
 
-        List<String> uids = pageResult.getList().stream().map(BoilerMajorIssuesPageRespVO::getSubmitId).filter(Objects::nonNull).toList();
+        List<String> uids = new ArrayList<>(pageResult.getList().stream().map(BoilerMajorIssuesPageRespVO::getSubmitId).filter(Objects::nonNull).toList());
+        List<String> uidApprovals = pageResult.getList().stream().map(BoilerMajorIssuesPageRespVO::getApprovalId).filter(Objects::nonNull).toList();
+        uids.addAll(uidApprovals);
 
         List<String> finalUids = new ArrayList<>(uids);
         List<String> processInstanceIds = pageResult.getList().stream().map(BoilerMajorIssuesPageRespVO::getProcessInstanceId).filter(Objects::nonNull).toList();
@@ -2590,7 +2595,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         //List<TaskOrderSignFileDO> finalTaskOrderSignFileDOs = taskOrderSignFileDOs;
         pageResult.getList().forEach(item -> {
             item.setSubmitUser(userMap.get(item.getSubmitId()));
-            item.setCurrentAuditor(userMap.get(item.getCurrentAuditorId()));
+            item.setCurrentAuditor(userMap.get(item.getApprovalId()));
             item.setOrderItemIds(dataMap.get(item.getId()));
 //            if (CollUtil.isNotEmpty(finalTaskOrderSignFileDOs)) {
 //                List<TaskOrderSignFileDO> list = finalTaskOrderSignFileDOs.stream().filter(x -> x.getOrderItemId().equals(item.getOrderItemId())).toList();

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderoperation/BoilerTaskOrderOperationServiceImpl.java

@@ -60,6 +60,7 @@ public class BoilerTaskOrderOperationServiceImpl extends ServiceImpl<BoilerTaskO
         // 插入
         BoilerTaskOrderOperationDO boilerTaskOrderOperation = BeanUtils.toBean(createReqVO, BoilerTaskOrderOperationDO.class);
         boilerTaskOrderOperation.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+        boilerTaskOrderOperation.setAuditorId(userId);
         boilerTaskOrderOperationMapper.insert(boilerTaskOrderOperation);
 
         String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId,

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

@@ -1673,19 +1673,57 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             }
         }
 
+        // 人员修改
+//        List<PipeTaskOrderUserDO> acceptOrderUserList = new ArrayList<>();
+//        PipeTaskOrderDO finalTaskOrderDO = taskOrderDO;
+//        if (taskOrderItemAuditUpdateVO.getUserList() == null) {
+//            taskOrderItemAuditUpdateVO.setUserList(new ArrayList<>());
+//        }
+//        taskOrderItemAuditUpdateVO.getUserList().forEach(team -> {
+//            PipeTaskOrderUserDO userDO = new PipeTaskOrderUserDO();
+//            userDO.setOrderId(finalTaskOrderDO.getId());
+//            userDO.setType(200);
+//            JSONObject teamJson = JSONObject.parseObject(team);
+//            userDO.setUserId(teamJson.getString("id"));
+//            acceptOrderUserList.add(userDO);
+//        });
+//
+//        if (!acceptOrderUserList.isEmpty()) {
+//            pipeTaskOrderUserMapper.delete(PipeTaskOrderUserDO::getOrderId, id);
+//            pipeTaskOrderUserMapper.insertBatch(acceptOrderUserList);
+//        }
+
         // 人员修改
         List<PipeTaskOrderUserDO> acceptOrderUserList = new ArrayList<>();
         PipeTaskOrderDO finalTaskOrderDO = taskOrderDO;
-        if (taskOrderItemAuditUpdateVO.getUserList() == null) {
-            taskOrderItemAuditUpdateVO.setUserList(new ArrayList<>());
+        if (taskOrderItemAuditUpdateVO.getTeamItemList() == null) {
+            taskOrderItemAuditUpdateVO.setTeamItemList(new ArrayList<>());
         }
-        taskOrderItemAuditUpdateVO.getUserList().forEach(team -> {
-            PipeTaskOrderUserDO userDO = new PipeTaskOrderUserDO();
-            userDO.setOrderId(finalTaskOrderDO.getId());
-            userDO.setType(200);
-            JSONObject teamJson = JSONObject.parseObject(team);
-            userDO.setUserId(teamJson.getString("id"));
-            acceptOrderUserList.add(userDO);
+        taskOrderItemAuditUpdateVO.getTeamItemList().forEach(team -> {
+
+            if (team.getUserIds() == null) {
+                team.setUserIds(new ArrayList<>());
+            }
+
+            List<PipeTaskOrderUserDO> memberList = team.getUserIds().stream().map(memberItem -> {
+                PipeTaskOrderUserDO member = new PipeTaskOrderUserDO();
+                member.setOrderId(finalTaskOrderDO.getId());
+                member.setType(200);
+                member.setUserId(memberItem);
+                member.setGroupTeamId(team.getGroupTeamId());
+                return member;
+            }).toList();
+
+            if (team.getLeaderId() != null) {
+                PipeTaskOrderUserDO leader = new PipeTaskOrderUserDO();
+                leader.setOrderId(finalTaskOrderDO.getId());
+                leader.setType(100);
+                leader.setGroupTeamId(team.getGroupTeamId());
+                leader.setUserId(team.getLeaderId());
+                acceptOrderUserList.add(leader);
+            }
+
+            acceptOrderUserList.addAll(memberList);
         });
 
         if (!acceptOrderUserList.isEmpty()) {
@@ -1899,7 +1937,9 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             return PageResult.empty();
         }
 
-        List<String> uids = pageResult.getList().stream().map(BoilerMajorIssuesPageRespVO::getSubmitId).filter(Objects::nonNull).toList();
+        List<String> uids = new ArrayList<>(pageResult.getList().stream().map(BoilerMajorIssuesPageRespVO::getSubmitId).filter(Objects::nonNull).toList());
+        List<String> uidApprovals = pageResult.getList().stream().map(BoilerMajorIssuesPageRespVO::getApprovalId).filter(Objects::nonNull).toList();
+        uids.addAll(uidApprovals);
 
         List<String> finalUids = new ArrayList<>(uids);
         List<String> processInstanceIds = pageResult.getList().stream().map(BoilerMajorIssuesPageRespVO::getProcessInstanceId).filter(Objects::nonNull).toList();
@@ -1934,7 +1974,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         pageResult.getList().forEach(item -> {
             item.setSubmitUser(userMap.get(item.getSubmitId()));
-            item.setCurrentAuditor(userMap.get(item.getCurrentAuditorId()));
+            item.setCurrentAuditor(userMap.get(item.getApprovalId()));
             item.setOrderItemIds(dataMap.get(item.getId()));
         });
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderoperation/PipeTaskOrderOperationServiceImpl.java

@@ -62,6 +62,7 @@ public class PipeTaskOrderOperationServiceImpl extends ServiceImpl<PipeTaskOrder
         // 插入
         PipeTaskOrderOperationDO TaskOrderOperation = BeanUtils.toBean(createReqVO, PipeTaskOrderOperationDO.class);
         TaskOrderOperation.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+        TaskOrderOperation.setAuditorId(userId);
         pipeTaskOrderOperationMapper.insert(TaskOrderOperation);
 
         String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId,