From 31c7da67982ec7004c1deb3bea894198bbf4a021 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 18 Oct 2024 17:41:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=80=E6=96=99=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=85=8D=E7=BD=AE=E5=92=8C=E8=AF=BB=E5=8F=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/common/biz/constant/MaterialConstants.java |  6 +++++-
 .../material/basic/service/IBmConfigService.java     |  2 ++
 .../basic/service/impl/BmConfigServiceImpl.java      | 12 ++++++++++++
 .../task/service/impl/TmTaskAuditLogServiceImpl.java |  6 ++++--
 5 files changed, 27 insertions(+), 3 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 b7ad19e7..33ce566d 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
@@ -7,4 +7,8 @@ package com.bonus.common.biz.constant;
 public class BmConfigItems {
     public static final String LEASE_TASK_AUDIT_ROLE_KEYS = "LeaseTaskAuditRoleKeys";
 
+    public static final String BACK_TASK_AUDIT_ROLE_KEYS = "BackTaskAuditRoleKeys";
+
+
+
 }
diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
index bac92021..1d110ca3 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
@@ -14,11 +14,15 @@ public class MaterialConstants
     public static final String UTF8 = "UTF-8";
 
     /**
-<<<<<<< HEAD
      * 领料任务类型
      */
     public static final Long LEASE_TASK_TYPE = 2L;
 
+    /**
+     * 退料任务类型
+     */
+    public static final Long BACK_TASK_TYPE = 3L;
+
     /**
      * XLS
      */
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 08ebcb88..d7eef2cd 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
@@ -69,4 +69,6 @@ public interface IBmConfigService
     public int deleteBmConfigById(Long id);
 
     public List<String> getLeaseTaskAuditRoleKeys();
+
+    public List<String> getBackTaskAuditRoleKeys();
 }
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 625dcf7e..81cd0bac 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
@@ -131,4 +131,16 @@ public class BmConfigServiceImpl implements IBmConfigService
         }
         return list;
     }
+
+    public List<String> getBackTaskAuditRoleKeys() {
+        List<String> list = new ArrayList();
+        BmConfig bmConfig = bmConfigMapper.selectBmConfigByItemName(BmConfigItems.BACK_TASK_AUDIT_ROLE_KEYS);
+        if (Objects.nonNull(bmConfig)) {
+            String value = getValueWithDefault(bmConfig.getItemValue(), "");
+            if (StringUtils.isNotEmpty(value)) {
+                list = Arrays.asList(value.split(","));
+            }
+        }
+        return list;
+    }
 }
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 3efa54c7..d270c615 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
@@ -119,8 +119,10 @@ public class TmTaskAuditLogServiceImpl implements ITmTaskAuditLogService {
         List<String> needRoles = new ArrayList<>();
         if (MaterialConstants.LEASE_TASK_TYPE.equals(tmTaskAuditLog.getTaskType())) {
             needRoles = bmConfigService.getLeaseTaskAuditRoleKeys();
-        }
-        //TODO, add more tasks logic to get needRoles
+        } else if (MaterialConstants.BACK_TASK_TYPE.equals(tmTaskAuditLog.getTaskType())) {
+            needRoles = bmConfigService.getBackTaskAuditRoleKeys();
+        } //TODO, add more tasks logic to get needRoles
+
         if (CollectionUtils.isEmpty(needRoles)) {
             return new TmTaskAuditResult(true);
         } else {