wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: (REQ-3300) 操作日志顺序调整

Browse Source
This commit is contained in:
xudawei 2025-02-19 14:42:34 +08:00
parent 274385bff8
commit 38438d261f
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java
View File

@ -167,7 +167,7 @@ public class ChangeRecordLogServiceImpl extends ServiceImpl<ChangeRecordLogDao,
.action(VisaLogTypeEnum.APPROVED_AGRESS.name()) .action(VisaLogTypeEnum.APPROVED_AGRESS.name())
.title(String.format(VisaLogTypeEnum.APPROVED_AGRESS.getTitle(), userName)) .title(String.format(VisaLogTypeEnum.APPROVED_AGRESS.getTitle(), userName))
.content(String.format(VisaLogTypeEnum.APPROVED_AGRESS.getContent(), 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; break;
case REVERT_APPROVE: case REVERT_APPROVE:
// 动作:审批流：撤回审批 // 动作:审批流：撤回审批
@ -220,7 +220,7 @@ public class ChangeRecordLogServiceImpl extends ServiceImpl<ChangeRecordLogDao,
.action(VisaLogTypeEnum.APPROVE_COMPLETED.name()) .action(VisaLogTypeEnum.APPROVE_COMPLETED.name())
.title(String.format(VisaLogTypeEnum.APPROVE_COMPLETED.getTitle(), changeRecord.getType().getDesc())) .title(String.format(VisaLogTypeEnum.APPROVE_COMPLETED.getTitle(), changeRecord.getType().getDesc()))
.content(String.format(VisaLogTypeEnum.APPROVE_COMPLETED.getContent(), 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; break;
default: default:
throw new ServiceException("变签日志类型不匹配"); throw new ServiceException("变签日志类型不匹配");

12
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java
View File

@ -38,10 +38,20 @@ public class Constants {
*/ */
public static final Integer CHANGE_STATUS_FILE_ORDER_BY = 5; 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 * 变更核定数据权限的code