From fb174749d9173101595492e38e80f399368a4360 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 1 Nov 2024 17:33:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E9=80=80=E6=96=99=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=B5=81=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/common/biz/constant/BmConfigItems.java | 4 ++-- .../bonus/material/basic/service/IBmConfigService.java | 4 ++-- .../basic/service/impl/BmConfigServiceImpl.java | 8 ++++---- .../com/bonus/material/task/domain/TmTaskAuditLog.java | 8 ++++---- .../task/service/impl/TmTaskAuditLogServiceImpl.java | 10 +++++----- .../mapper/material/task/TmTaskAuditLogMapper.xml | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java index 0e00c824..cbc8f32e 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java @@ -10,9 +10,9 @@ public class BmConfigItems { public static final String WEI_XIU_ROLE_IDS = "KuGuanRoleIDs"; - public static final String LEASE_TASK_AUDIT_ROLE_KEYS = "LeaseTaskAuditRoleKeys"; + public static final String LEASE_TASK_AUDIT_ROLE_IDS = "LeaseTaskAuditRoleIDs"; - public static final String BACK_TASK_AUDIT_ROLE_KEYS = "BackTaskAuditRoleKeys"; + public static final String BACK_TASK_AUDIT_ROLE_IDS = "BackTaskAuditRoleIDs"; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmConfigService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmConfigService.java index d7eef2cd..f3bb5c3b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmConfigService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmConfigService.java @@ -68,7 +68,7 @@ public interface IBmConfigService */ public int deleteBmConfigById(Long id); - public List getLeaseTaskAuditRoleKeys(); + public List getLeaseTaskAuditRoleIds(); - public List getBackTaskAuditRoleKeys(); + public List getBackTaskAuditRoleIds(); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java index 51e09d0f..714337f6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmConfigServiceImpl.java @@ -147,9 +147,9 @@ public class BmConfigServiceImpl implements IBmConfigService } /**获取所设定的领料审核角色列表*/ - public List getLeaseTaskAuditRoleKeys() { + public List getLeaseTaskAuditRoleIds() { List list = new ArrayList(); - BmConfig bmConfig = bmConfigMapper.selectBmConfigByItemName(BmConfigItems.LEASE_TASK_AUDIT_ROLE_KEYS); + BmConfig bmConfig = bmConfigMapper.selectBmConfigByItemName(BmConfigItems.LEASE_TASK_AUDIT_ROLE_IDS); if (Objects.nonNull(bmConfig)) { String value = getValueWithDefault(bmConfig.getItemValue(), ""); if (StringUtils.isNotEmpty(value)) { @@ -160,9 +160,9 @@ public class BmConfigServiceImpl implements IBmConfigService } /**获取所设定的退料审核角色列表*/ - public List getBackTaskAuditRoleKeys() { + public List getBackTaskAuditRoleIds() { List list = new ArrayList(); - BmConfig bmConfig = bmConfigMapper.selectBmConfigByItemName(BmConfigItems.BACK_TASK_AUDIT_ROLE_KEYS); + BmConfig bmConfig = bmConfigMapper.selectBmConfigByItemName(BmConfigItems.BACK_TASK_AUDIT_ROLE_IDS); if (Objects.nonNull(bmConfig)) { String value = getValueWithDefault(bmConfig.getItemValue(), ""); if (StringUtils.isNotEmpty(value)) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTaskAuditLog.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTaskAuditLog.java index 234fe66d..5d9b0aa4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTaskAuditLog.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTaskAuditLog.java @@ -32,9 +32,9 @@ public class TmTaskAuditLog extends BaseEntity { @ApiModelProperty(value = "任务类型(定义数据字典)") private Long taskType; - /** 角色权限字符串 */ - @Excel(name = "角色权限字符串") - @ApiModelProperty(value = "角色权限字符串") - private String roleKey; + /** 角色Id字符串 */ + @Excel(name = "角色Id字符串") + @ApiModelProperty(value = "角色Id字符串") + private String roleId; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskAuditLogServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskAuditLogServiceImpl.java index d270c615..27c8b917 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskAuditLogServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskAuditLogServiceImpl.java @@ -118,26 +118,26 @@ public class TmTaskAuditLogServiceImpl implements ITmTaskAuditLogService { public TmTaskAuditResult getAuditResult(TmTaskAuditLog tmTaskAuditLog) { List needRoles = new ArrayList<>(); if (MaterialConstants.LEASE_TASK_TYPE.equals(tmTaskAuditLog.getTaskType())) { - needRoles = bmConfigService.getLeaseTaskAuditRoleKeys(); + needRoles = bmConfigService.getLeaseTaskAuditRoleIds(); } else if (MaterialConstants.BACK_TASK_TYPE.equals(tmTaskAuditLog.getTaskType())) { - needRoles = bmConfigService.getBackTaskAuditRoleKeys(); + needRoles = bmConfigService.getBackTaskAuditRoleIds(); } //TODO, add more tasks logic to get needRoles if (CollectionUtils.isEmpty(needRoles)) { return new TmTaskAuditResult(true); } else { - List auditRoleKeys = selectTmTaskAuditRoleKeyList(tmTaskAuditLog); + List auditRoleIds = selectTmTaskAuditRoleKeyList(tmTaskAuditLog); String nextRole = needRoles.get(0); boolean finished = false; for (int i = 0; i < needRoles.size(); i++) { if (i < needRoles.size() - 1) { // 遍历，还没到最后一个 - if (auditRoleKeys.contains(needRoles.get(i))) { + if (auditRoleIds.contains(needRoles.get(i))) { nextRole = needRoles.get(i + 1); } } else { // 遍历，已经到最后一个了 - if (auditRoleKeys.contains(needRoles.get(i))) { + if (auditRoleIds.contains(needRoles.get(i))) { nextRole = ""; finished = true; } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskAuditLogMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskAuditLogMapper.xml index 787d9295..4ede6c8a 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskAuditLogMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskAuditLogMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"