From 38438d261f03d0933af5eacd749896346d85b5b3 Mon Sep 17 00:00:00 2001
From: xudawei <xudawei@axzo.cn>
Date: Wed, 19 Feb 2025 14:42:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20(REQ-3300)=20=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ChangeRecordLogServiceImpl.java     |  4 ++--
 .../axzo/nanopart/visa/server/utils/Constants.java   | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java
index f21b0fe0..f0601656 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java
@@ -167,7 +167,7 @@ public class ChangeRecordLogServiceImpl extends ServiceImpl<ChangeRecordLogDao,
                         .action(VisaLogTypeEnum.APPROVED_AGRESS.name())
                         .title(String.format(VisaLogTypeEnum.APPROVED_AGRESS.getTitle(), userName))
                         .content(String.format(VisaLogTypeEnum.APPROVED_AGRESS.getContent(), userName))
-                        .orderBy(Constants.CHANGE_STATUS_FILE_ORDER_BY).build());
+                        .orderBy(Constants.ONE_APPROVED_ORDER_BY).build());
                 break;
             case REVERT_APPROVE:
                 // 动作:审批流：撤回审批
@@ -220,7 +220,7 @@ public class ChangeRecordLogServiceImpl extends ServiceImpl<ChangeRecordLogDao,
                         .action(VisaLogTypeEnum.APPROVE_COMPLETED.name())
                         .title(String.format(VisaLogTypeEnum.APPROVE_COMPLETED.getTitle(), changeRecord.getType().getDesc()))
                         .content(String.format(VisaLogTypeEnum.APPROVE_COMPLETED.getContent(), changeRecord.getType().getDesc()))
-                        .orderBy(Constants.CHANGE_STATUS_FILE_ORDER_BY).build());
+                        .orderBy(Constants.APPROVE_COMPLETED_ORDER_BY).build());
                 break;
             default:
                 throw new ServiceException("变签日志类型不匹配");
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java
index 4fdcf262..4ed08cdf 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java
@@ -38,10 +38,20 @@ public class Constants {
      */
     public static final Integer CHANGE_STATUS_FILE_ORDER_BY = 5;
 
+    /**
+     * 单个节点审批通过排序
+     */
+    public static final Integer ONE_APPROVED_ORDER_BY = 6;
+
+    /**
+     * 全部节点审批通过排序
+     */
+    public static final Integer APPROVE_COMPLETED_ORDER_BY = 7;
+
     /**
      * 审批相关-排序
      */
-    public static final Integer APPROVE_ORDER_BY = 5;
+    public static final Integer APPROVE_ORDER_BY = 6;
 
     /**
      * 变更核定数据权限的code