fix: 81947 在线编辑--签章页的签章在驳回到主起草人上传会议纪要节点后，换人、转办等操作，签章信息未更新

2024-02-22 15:52:25 +08:00
parent 80f3142bee
commit 4fb810c623
2 changed files with 8 additions and 2 deletions
@@ -1,7 +1,6 @@
 package com.jero.modules.activiti.process.esRevision.entity;

 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -703,7 +703,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
        SignInfo singInfo;

        // 获取主起草用户
-        processApprovalRecords = parMap.get(MAIN_DRAFT_USER_DISTRIBUTE);
+        processApprovalRecords = parMap.get(MAIN_DRAFT_USER_UPLOAD);
+        processApprovalRecords.sort(Comparator.comparing(ProcessApprovalRecord::getEndTime).reversed());
        singInfo = this.getSingInfo(processApprovalRecords.get(0));
        result.put("起草签署", Collections.singletonList(singInfo));

@@ -726,11 +727,15 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process

        // 获取主管级领导审核用户
        processApprovalRecords = parMap.get(LEADER_APPROVAL);
+        // 将processApprovalRecords按照EndTime倒序排序
+        processApprovalRecords.sort(Comparator.comparing(ProcessApprovalRecord::getEndTime).reversed());
        singInfo = this.getSingInfo(processApprovalRecords.get(0));
        result.put("审核签署", Collections.singletonList(singInfo));

        // 获取标准化签署+标准化审核用户
        processApprovalRecords = parMap.get(STANDARDIZATION_APPROVAL);
+        // 将processApprovalRecords按照EndTime倒序排序
+        processApprovalRecords.sort(Comparator.comparing(ProcessApprovalRecord::getEndTime).reversed());
        singInfo = this.getSingInfo(processApprovalRecords.get(0));
        result.put("标准化签署", Collections.singletonList(singInfo));

@@ -752,6 +757,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process

        // 获取批准签署+总工程师用户姓名
        processApprovalRecords = parMap.get(CHIEF_ENGINEER_APPROVAL);
+        // 将processApprovalRecords按照EndTime倒序排序
+        processApprovalRecords.sort(Comparator.comparing(ProcessApprovalRecord::getEndTime).reversed());
        singInfo = this.getSingInfo(processApprovalRecords.get(0));
        result.put("批准签署", Collections.singletonList(singInfo));