检验意见通知书审核人显示调整

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

@@ -402,4 +402,10 @@ public class BoilerOrderItemPageRespVO {
     @Schema(description = "意见书上报人列表")
     private List<AdminUserRespDTO> reporterUserList;
 
+    private String approvalId;
+
+    private String ratifyId;
+
+    private AdminUserRespDTO ratifyUser;
+
 }

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

@@ -229,6 +229,8 @@ public class PipeOrderItemPageRespVO {
     @Schema(description = "当前审核人")
     private AdminUserRespDTO currentAuditor;
 
+    private AdminUserRespDTO ratifyUser;
+
     @Schema(description = "提交人")
     private AdminUserRespDTO submitUser;
 
@@ -407,4 +409,8 @@ public class PipeOrderItemPageRespVO {
 
     @Schema(description = "意见书上报人列表")
     private List<AdminUserRespDTO> reporterUserList;
+
+    private String approvalId;
+
+    private String ratifyId;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderitem/BoilerTaskOrderItemMapper.java

@@ -72,6 +72,8 @@ public interface BoilerTaskOrderItemMapper extends BaseMapperX<BoilerTaskOrderIt
                 selectAs(BoilerTaskOrderItemReportDO::getTemplateId,BoilerOrderItemPageRespVO::getTemplateId).
                 selectAs(BoilerTaskOrderItemReportDO::getFinishUploadTime,BoilerOrderItemPageRespVO::getFinishUploadTime).
                 selectAs(BoilerTaskOrderItemReportDO::getSubmitId,BoilerOrderItemPageRespVO::getSubmitId).
+                selectAs(BoilerTaskOrderItemReportDO::getApprovalId,BoilerOrderItemPageRespVO::getApprovalId).
+                selectAs(BoilerTaskOrderItemReportDO::getRatifyId,BoilerOrderItemPageRespVO::getRatifyId).
                 selectAs(EquipBoilerDO::getEquipCode,BoilerOrderItemPageRespVO::getEquipCode).
                 selectAs(EquipBoilerDO::getEquipName,BoilerOrderItemPageRespVO::getEquipName).
                 selectAs(EquipBoilerDO::getEquipStreet,BoilerOrderItemPageRespVO::getEquipStreet).

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/pipetaskorderitem/PipeTaskOrderItemMapper.java

@@ -82,6 +82,8 @@ public interface PipeTaskOrderItemMapper extends BaseMapperX<PipeTaskOrderItemDO
                 selectAs(PipeTaskOrderItemReportDO::getTemplateId,PipeOrderItemPageRespVO::getTemplateId).
                 selectAs(PipeTaskOrderItemReportDO::getFinishUploadTime,PipeOrderItemPageRespVO::getFinishUploadTime).
                 selectAs(PipeTaskOrderItemReportDO::getSubmitId,PipeOrderItemPageRespVO::getSubmitId).
+                selectAs(PipeTaskOrderItemReportDO::getApprovalId,PipeOrderItemPageRespVO::getApprovalId).
+                selectAs(PipeTaskOrderItemReportDO::getRatifyId,PipeOrderItemPageRespVO::getRatifyId).
                 selectAs(EquipPipeDO::getProjectNo,PipeOrderItemPageRespVO::getProjectNo).
                 selectAs(EquipPipeDO::getProjectName, PipeOrderItemPageRespVO::getEquipName).
                 selectAs(EquipPipeDO::getCertificateNo, PipeOrderItemPageRespVO::getUseRegisterNo).

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

@@ -5352,6 +5352,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                 .filter(Objects::nonNull).collect(Collectors.toList());
         List<String> userIds = pageResult.getList().stream().map(BoilerOrderItemPageRespVO::getCurrentAuditorId).filter(Objects::nonNull).collect(Collectors.toList());
         List<String> userIds4 = pageResult.getList().stream().map(BoilerOrderItemPageRespVO::getSubmitId).filter(Objects::nonNull).collect(Collectors.toList());
+        List<String> userIds_approve = pageResult.getList().stream().map(BoilerOrderItemPageRespVO::getApprovalId).filter(Objects::nonNull).collect(Collectors.toList());
+        List<String> userIds_ratify = pageResult.getList().stream().map(BoilerOrderItemPageRespVO::getRatifyId).filter(Objects::nonNull).collect(Collectors.toList());
         //user List
         Map<String, BpmTaskDTO> bpmTaskDTOMap = bpmTaskApi.getLastTaskMap(processInstanceIds).getData();
         pageResult.getList().forEach(acceptOrder -> {
@@ -5362,10 +5364,19 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             }
         });
         userIds.addAll(userIds4);
+        userIds.addAll(userIds_approve);
+        userIds.addAll(userIds_ratify);
         if (userIds.size() > 0) {
             Map<String, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
             pageResult.getList().forEach(acceptOrder -> {
-                acceptOrder.setCurrentAuditor(userMap.get(acceptOrder.getCurrentAuditorId()));
+                if (acceptOrder.getApprovalId() != null){
+                    acceptOrder.setCurrentAuditor(userMap.get(acceptOrder.getApprovalId()));
+                }else{
+                    acceptOrder.setCurrentAuditor(userMap.get(acceptOrder.getCurrentAuditorId()));
+                }
+                if (acceptOrder.getRatifyId() != null){
+                    acceptOrder.setRatifyUser(userMap.get(acceptOrder.getApprovalId()));
+                }
                 acceptOrder.setSubmitUser(userMap.get(acceptOrder.getSubmitId()));
             });
 

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

@@ -4596,6 +4596,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                 .filter(Objects::nonNull).collect(Collectors.toList());
         List<String> userIds = pageResult.getList().stream().map(PipeOrderItemPageRespVO::getCurrentAuditorId).filter(Objects::nonNull).collect(Collectors.toList());
         List<String> userIds4 = pageResult.getList().stream().map(PipeOrderItemPageRespVO::getSubmitId).filter(Objects::nonNull).collect(Collectors.toList());
+        List<String> userIds_approve = pageResult.getList().stream().map(PipeOrderItemPageRespVO::getApprovalId).filter(Objects::nonNull).collect(Collectors.toList());
+        List<String> userIds_ratify = pageResult.getList().stream().map(PipeOrderItemPageRespVO::getRatifyId).filter(Objects::nonNull).collect(Collectors.toList());
         //user List
         Map<String, BpmTaskDTO> bpmTaskDTOMap = bpmTaskApi.getLastTaskMap(processInstanceIds).getData();
         pageResult.getList().forEach(acceptOrder -> {
@@ -4606,9 +4608,19 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             }
         });
         userIds.addAll(userIds4);
+        userIds.addAll(userIds_approve);
+        userIds.addAll(userIds_ratify);
         if (userIds.size() > 0) {
             Map<String, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
             pageResult.getList().forEach(acceptOrder -> {
+                if (acceptOrder.getApprovalId() != null){
+                    acceptOrder.setCurrentAuditor(userMap.get(acceptOrder.getApprovalId()));
+                }else{
+                    acceptOrder.setCurrentAuditor(userMap.get(acceptOrder.getCurrentAuditorId()));
+                }
+                if (acceptOrder.getRatifyId() != null){
+                    acceptOrder.setRatifyUser(userMap.get(acceptOrder.getApprovalId()));
+                }
                 acceptOrder.setCurrentAuditor(userMap.get(acceptOrder.getCurrentAuditorId()));
                 acceptOrder.setSubmitUser(userMap.get(acceptOrder.getSubmitId()));
             });