修改节点名

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerTaskOrderItemReportServiceImpl.java

@@ -498,7 +498,7 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
                     BoilerTaskOrderItemReportRecordDO boilerTaskOrderItemReportRecordDO = new BoilerTaskOrderItemReportRecordDO();
                     boilerTaskOrderItemReportRecordDO.setReportId(boilerTaskOrderItemReportDO.getId());
                     boilerTaskOrderItemReportRecordDO.setProcess(
-                            "审批人".equals(comment.getNodeName()) ? 700 : 600);
+                            "审批人员".equals(comment.getNodeName()) ? 700 : 600);
                     boilerTaskOrderItemReportRecordDO.setRemark(comment.getComment());
                     boilerTaskOrderItemReportRecordDO.setCreateTime(comment.getCreateDate());
                     CommonResult<List<AdminUserRespDTO>> userListByNickname = adminUserApi.getUserListByNickname(comment.getUserName());
@@ -522,14 +522,14 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
                 }).toList();
         taskOrderItemReportRecordMapper.insertBatch(newComments);
 
-        // 根据NODE_NAME实时更新报告的审核人/审批人信息
-        // 找最新的"审核人"节点的【同意】或【已阅】评论
+        // 根据NODE_NAME实时更新报告的审核人员/审批人员信息
+        // 找最新的"审核人员"节点的【同意】或【已阅】评论
         comments.stream()
                 .filter(comment -> latestRecord == null || comment.getCreateDate().isAfter(latestRecord.getCreateTime()))
                 .filter(c -> c.getComment() != null
                         && (c.getComment().contains("【同意】") || c.getComment().contains("【已阅】"))
                         && !"common.toolbar.stepBack.label".equals(c.getExtAtt3())
-                        && "审核人".equals(c.getNodeName()))
+                        && "审核人员".equals(c.getNodeName()))
                 .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
                 .ifPresent(approval -> {
                     List<AdminUserRespDTO> userList = adminUserApi.getUserListByNickname(approval.getUserName()).getCheckedData();
@@ -541,13 +541,13 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
                     }
                 });
 
-        // 找最新的"审批人"节点的【同意】或【已阅】评论
+        // 找最新的"审批人员"节点的【同意】或【已阅】评论
         comments.stream()
                 .filter(comment -> latestRecord == null || comment.getCreateDate().isAfter(latestRecord.getCreateTime()))
                 .filter(c -> c.getComment() != null
                         && (c.getComment().contains("【同意】") || c.getComment().contains("【已阅】"))
                         && !"common.toolbar.stepBack.label".equals(c.getExtAtt3())
-                        && "审批人".equals(c.getNodeName()))
+                        && "审批人员".equals(c.getNodeName()))
                 .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
                 .ifPresent(ratify -> {
                     List<AdminUserRespDTO> userList = adminUserApi.getUserListByNickname(ratify.getUserName()).getCheckedData();
@@ -569,7 +569,7 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
      * @param boilerTaskOrderItemReportDO 报告
      */
     public void updateReportStatus(BoilerTaskOrderItemReportDO boilerTaskOrderItemReportDO, ExternalOACommentRes commentRes) {
-        // 根据NODE_NAME区分审核人和审批人
+        // 根据NODE_NAME区分审核人员和审批人员
         List<ExternalOACommentInfoRes> comments = commentRes != null && commentRes.getData() != null
                 ? commentRes.getData().getComments() : null;
         String approvalId = null;
@@ -580,21 +580,21 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
         LocalDateTime ratifyTime = null;
 
         if (comments != null && !comments.isEmpty()) {
-            // NODE_NAME="审核人" → approval（审核人）
+            // NODE_NAME="审核人员" → approval（审核人员）
             ExternalOACommentInfoRes approval = comments.stream()
                     .filter(c -> c.getComment() != null
                             && (c.getComment().contains("【同意】") || c.getComment().contains("【已阅】"))
                             && !"common.toolbar.stepBack.label".equals(c.getExtAtt3())
-                            && "审核人".equals(c.getNodeName()))
+                            && "审核人员".equals(c.getNodeName()))
                     .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
                     .orElse(null);
 
-            // NODE_NAME="审批人" → ratify（审批人）
+            // NODE_NAME="审批人员" → ratify（审批人员）
             ExternalOACommentInfoRes ratify = comments.stream()
                     .filter(c -> c.getComment() != null
                             && (c.getComment().contains("【同意】") || c.getComment().contains("【已阅】"))
                             && !"common.toolbar.stepBack.label".equals(c.getExtAtt3())
-                            && "审批人".equals(c.getNodeName()))
+                            && "审批人员".equals(c.getNodeName()))
                     .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
                     .orElse(null);
 
@@ -653,7 +653,7 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
             }
         }
 
-        // 调用重载方法，传入从OA评论中提取的审核人和审批人信息
+        // 调用重载方法，传入从OA评论中提取的审核人员和审批人员信息
         updateOrderItemRatifyFinish(boilerTaskOrderItemReportDO.getId(), approvalId, approvalName, approvalTime, ratifyId, ratifyName, ratifyTime);
     }
 
@@ -741,7 +741,7 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
     }
 
     /**
-     * 办结报告（轮询调用，从OA评论中获取审核人和审批人）
+     * 办结报告（轮询调用，从OA评论中获取审核人员和审批人员）
      */
     public void updateOrderItemRatifyFinish(String id, String approvalId, String approvalName, LocalDateTime approvalTime,
                                             String ratifyId, String ratifyName, LocalDateTime ratifyTime) {
@@ -754,13 +754,13 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
         updateObj.setTaskStatus(TaskOrderStatusEnum.REPORT_FINISH.getStatus());
         updateObj.setReturnReason("");
 
-        // 设置审核人信息
+        // 设置审核人员信息
         if (approvalId != null) {
             updateObj.setApprovalId(approvalId);
             updateObj.setApprovalName(approvalName);
             updateObj.setApprovalTime(approvalTime != null ? approvalTime : LocalDateTime.now());
         }
-        // 设置审批人信息
+        // 设置审批人员信息
         if (ratifyId != null) {
             updateObj.setRatifyId(ratifyId);
             updateObj.setRatifyName(ratifyName);
@@ -946,7 +946,7 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
 
             }
 
-            //当主报告完成审批后更新所有子报告的审批人
+            //当主报告完成审批后更新所有子报告的审批人员
             LambdaUpdateWrapper<BoilerTaskOrderItemReportDO> updateBySubReport = new LambdaUpdateWrapper<>();
             updateBySubReport.eq(BoilerTaskOrderItemReportDO::getOrderItemId, taskOrderItemReportDO.getOrderItemId());
             updateBySubReport.eq(BoilerTaskOrderItemReportDO::getReportType, TaskOrderItemReportTypeEnum.SUB_REPORT.getType());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeTaskOrderItemReportServiceImpl.java

@@ -287,7 +287,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                     PipeTaskOrderItemReportRecordDO pipeTaskOrderItemReportRecordDO = new PipeTaskOrderItemReportRecordDO();
                     pipeTaskOrderItemReportRecordDO.setReportId(pipeTaskOrderItemReportDO.getId());
                     pipeTaskOrderItemReportRecordDO.setProcess(
-                            "审批人".equals(comment.getNodeName()) ? 700 : 600);
+                            "审批人员".equals(comment.getNodeName()) ? 700 : 600);
                     pipeTaskOrderItemReportRecordDO.setRemark(comment.getComment());
                     pipeTaskOrderItemReportRecordDO.setCreateTime(comment.getCreateDate());
                     String userName = comment.getUserName();
@@ -309,14 +309,14 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                 }).toList();
         pipeTaskOrderItemReportRecordMapper.insertBatch(newComments);
 
-        // 根据NODE_NAME实时更新报告的审核人/审批人信息
-        // 找最新的"审核人"节点的【同意】或【已阅】评论
+        // 根据NODE_NAME实时更新报告的审核人员/审批人员信息
+        // 找最新的"审核人员"节点的【同意】或【已阅】评论
         comments.stream()
                 .filter(comment -> latestRecord == null || comment.getCreateDate().isAfter(latestRecord.getCreateTime()))
                 .filter(c -> c.getComment() != null
                         && (c.getComment().contains("【同意】") || c.getComment().contains("【已阅】"))
                         && !"common.toolbar.stepBack.label".equals(c.getExtAtt3())
-                        && "审核人".equals(c.getNodeName()))
+                        && "审核人员".equals(c.getNodeName()))
                 .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
                 .ifPresent(approval -> {
                     List<AdminUserRespDTO> userList = adminUserApi.getUserListByNickname(approval.getUserName()).getCheckedData();
@@ -328,13 +328,13 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                     }
                 });
 
-        // 找最新的"审批人"节点的【同意】或【已阅】评论
+        // 找最新的"审批人员"节点的【同意】或【已阅】评论
         comments.stream()
                 .filter(comment -> latestRecord == null || comment.getCreateDate().isAfter(latestRecord.getCreateTime()))
                 .filter(c -> c.getComment() != null
                         && (c.getComment().contains("【同意】") || c.getComment().contains("【已阅】"))
                         && !"common.toolbar.stepBack.label".equals(c.getExtAtt3())
-                        && "审批人".equals(c.getNodeName()))
+                        && "审批人员".equals(c.getNodeName()))
                 .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
                 .ifPresent(ratify -> {
                     List<AdminUserRespDTO> userList = adminUserApi.getUserListByNickname(ratify.getUserName()).getCheckedData();
@@ -476,7 +476,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
      * @param comments                  OA 流程评论列表
      */
     public void updateReportStatus(PipeTaskOrderItemReportDO pipeTaskOrderItemReportDO, List<ExternalOACommentInfoRes> comments) {
-        // 根据NODE_NAME区分审核人和审批人
+        // 根据NODE_NAME区分审核人员和审批人员
         String approvalId = null;
         String approvalName = null;
         LocalDateTime approvalTime = null;
@@ -485,21 +485,21 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
         LocalDateTime ratifyTime = null;
 
         if (comments != null && !comments.isEmpty()) {
-            // NODE_NAME="审核人" → approval（审核人）
+            // NODE_NAME="审核人员" → approval（审核人员）
             ExternalOACommentInfoRes approval = comments.stream()
                     .filter(c -> c.getComment() != null
                             && (c.getComment().contains("【同意】") || c.getComment().contains("【已阅】"))
                             && !"common.toolbar.stepBack.label".equals(c.getExtAtt3())
-                            && "审核人".equals(c.getNodeName()))
+                            && "审核人员".equals(c.getNodeName()))
                     .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
                     .orElse(null);
 
-            // NODE_NAME="审批人" → ratify（审批人）
+            // NODE_NAME="审批人员" → ratify（审批人员）
             ExternalOACommentInfoRes ratify = comments.stream()
                     .filter(c -> c.getComment() != null
                             && (c.getComment().contains("【同意】") || c.getComment().contains("【已阅】"))
                             && !"common.toolbar.stepBack.label".equals(c.getExtAtt3())
-                            && "审批人".equals(c.getNodeName()))
+                            && "审批人员".equals(c.getNodeName()))
                     .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
                     .orElse(null);
 
@@ -557,7 +557,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                 }
             }
 
-            // 调用重载方法，传入从OA评论中提取的审核人和审批人信息
+            // 调用重载方法，传入从OA评论中提取的审核人员和审批人员信息
             updateOrderItemRatifyFinish(pipeTaskOrderItemReportDO.getId(), approvalId, approvalName, approvalTime, ratifyId, ratifyName, ratifyTime);
         }
     }
@@ -638,7 +638,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
     }
 
     /**
-     * 办结报告（轮询调用，从OA评论中获取审核人和审批人）
+     * 办结报告（轮询调用，从OA评论中获取审核人员和审批人员）
      */
     public void updateOrderItemRatifyFinish(String id, String approvalId, String approvalName, LocalDateTime approvalTime,
                                             String ratifyId, String ratifyName, LocalDateTime ratifyTime) {
@@ -651,13 +651,13 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
         updateObj.setTaskStatus(TaskOrderStatusEnum.REPORT_FINISH.getStatus());
         updateObj.setReturnReason("");
 
-        // 设置审核人信息
+        // 设置审核人员信息
         if (approvalId != null) {
             updateObj.setApprovalId(approvalId);
             updateObj.setApprovalName(approvalName);
             updateObj.setApprovalTime(approvalTime != null ? approvalTime : LocalDateTime.now());
         }
-        // 设置审批人信息
+        // 设置审批人员信息
         if (ratifyId != null) {
             updateObj.setRatifyId(ratifyId);
             updateObj.setRatifyName(ratifyName);
@@ -851,7 +851,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
 
             }
 
-            //当主报告完成审批后更新所有子报告的审批人
+            //当主报告完成审批后更新所有子报告的审批人员
             LambdaUpdateWrapper<PipeTaskOrderItemReportDO> updateBySubReport = new LambdaUpdateWrapper<>();
             updateBySubReport.eq(PipeTaskOrderItemReportDO::getOrderItemId, taskOrderItemReportDO.getOrderItemId());
             updateBySubReport.eq(PipeTaskOrderItemReportDO::getReportType, TaskOrderItemReportTypeEnum.SUB_REPORT.getType());