From f5b29099456f372dd781cf39268ebaf7b443a2dc Mon Sep 17 00:00:00 2001
From: liuqingkun <liu840185317@users.noreply.github.com>
Date: Wed, 28 Jan 2026 17:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=8C=E7=BA=A7=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9=E4=BA=BA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=B9=B6=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/entity/LdTwoOutStorage.java          |  5 +++++
 .../KgLowDurable/service/IUserService.java    |  2 +-
 .../Impl/LdOnePutStorageServiceImpl.java      |  8 ++++++--
 .../Impl/LdTwoOutStorageServiceImpl.java      | 15 ++++++++++-----
 .../service/Impl/UserServiceImpl.java         | 19 ++++++++++++++-----
 5 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java
index 6ac0afa..2865f32 100644
--- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java
+++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoOutStorage.java
@@ -102,4 +102,9 @@ public class LdTwoOutStorage implements Serializable {
      * 分组名称
      */
     private String groupName;
+
+    /**
+     * 审批人员
+     */
+    private String approvers;
 }
\ No newline at end of file
diff --git a/src/main/java/com/nov/KgLowDurable/service/IUserService.java b/src/main/java/com/nov/KgLowDurable/service/IUserService.java
index 5cbbf39..ef7ab8d 100644
--- a/src/main/java/com/nov/KgLowDurable/service/IUserService.java
+++ b/src/main/java/com/nov/KgLowDurable/service/IUserService.java
@@ -27,7 +27,7 @@ public interface IUserService extends IService<User> {
      * @param formId
      * @return
      */
-    boolean getApprover(String mainErDepartment, String type,Long formId);
+    String getApprover(String mainErDepartment, String type,Long formId);
 
     /**
      * 获取部门负责人
diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java
index a31c302..f34fa28 100644
--- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java
+++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java
@@ -195,9 +195,13 @@ public class LdOnePutStorageServiceImpl extends ServiceImpl<LdOnePutStorageMappe
      */
     private void setApproverInfo(LdOnePutStorageDto dto, UserInfoVO userInfo) {
         try {
-            boolean tuser = userService.getApprover(
-                    null, "0",dto.getId()
+            String approvers = userService.getApprover(
+                    null, "0", dto.getId()
             );
+
+            LdOnePutStorage ldOnePutStorage = onePutStorageMapper.selectById(dto.getId());
+            ldOnePutStorage.setApprovers(approvers);
+            onePutStorageMapper.updateById(ldOnePutStorage);
         } catch (Exception e) {
             throw new CustomerException("获取审批人失败: " + e.getMessage());
         }
diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java
index d22c7b9..e0d96e4 100644
--- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java
+++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java
@@ -16,6 +16,7 @@ import com.nov.KgLowDurable.pojo.vo.*;
 import com.nov.KgLowDurable.service.*;
 import com.nov.KgLowDurable.util.SerialNumberUtil;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,7 @@ import java.util.stream.Collectors;
  * 服务实现类
  * @author liweidong
  */
+@Slf4j
 @Service
 @AllArgsConstructor
 public class LdTwoOutStorageServiceImpl extends ServiceImpl<LdTwoOutStorageMapper, LdTwoOutStorage> implements ILdTwoOutStorageService {
@@ -112,13 +114,14 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl<LdTwoOutStorageMappe
             ldTwoOutStorageDetail.setOptTime(new Date());
             //处理剩余库存
             BigDecimal num = null;
-            if(BatchConstant.CONSUMER.equals(ldTwoOutStorageDetail.getType())){
+            if (BatchConstant.CONSUMER.equals(ldTwoOutStorageDetail.getType())) {
                 LdConsumerForm consumerForm = consumerFormService.getById(ldTwoOutStorageDetail.getTwoInventoryId());
                 num = consumerForm.getNum();
-            }else {
+            } else {
                 LdDurableForm durableForm = durableFormService.getById(ldTwoOutStorageDetail.getTwoInventoryId());
                 num = durableForm.getNum();
             }
+
             BigDecimal result = num.subtract(ldTwoOutStorageDetail.getNum());
             ldTwoOutStorageDetail.setResidueNum(result);
 
@@ -131,9 +134,10 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl<LdTwoOutStorageMappe
 
         //获取审批人
         try {
-            boolean approver = userService.getApprover(ldTwoOutStorage.getDepartmentId(),
+            String approvers = userService.getApprover(ldTwoOutStorage.getDepartmentId(),
                     "1", ldTwoOutStorage.getId());
-
+            ldTwoOutStorage.setApprovers(approvers);
+            twoOutStorageMapper.updateById(ldTwoOutStorage);
         } catch (Exception e) {
             throw new CustomerException("获取审批人失败: " + e.getMessage());
         }
@@ -174,7 +178,8 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl<LdTwoOutStorageMappe
                 new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.TEXT_RECEIVER, Value.textValue(dto.getLdTwoOutStorage().getProposerName())),
                 new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.TEXT_DEPARTMENT, Value.textValue(dto.getLdTwoOutStorage().getDepartment())),
                 new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.TEXT_ORDER_NO, Value.textValue(dto.getLdTwoOutStorage().getOrderNo())),
-                new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.OUT_GROUP, Value.textValue(dto.getLdTwoOutStorage().getGroupName().equals("自由出库") ? null : dto.getLdTwoOutStorage().getGroupName())),
+                new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.OUT_GROUP, Value.textValue("自由出库".equals(dto.getLdTwoOutStorage().getGroupName()) ? null :
+                        dto.getLdTwoOutStorage().getGroupName())),
                 new Content(TwoOutApproverConstant.TEXT, TwoOutApproverConstant.TEXTAREA_REASON, Value.textValue(dto.getLdTwoOutStorage().getReason())),
                 new Content(TwoOutApproverConstant.TABLE, TwoOutApproverConstant.TABLE_MATERIAL_LIST,
                         Value.tableValue(tableRowList))
diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/UserServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/UserServiceImpl.java
index 2e9e611..e4d21ac 100644
--- a/src/main/java/com/nov/KgLowDurable/service/Impl/UserServiceImpl.java
+++ b/src/main/java/com/nov/KgLowDurable/service/Impl/UserServiceImpl.java
@@ -157,7 +157,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             "}";
 
     @Override
-    public boolean getApprover(String mainErDepartment, String type,Long formId) {
+    public String getApprover(String mainErDepartment, String type,Long formId) {
         // 参数校验
         if (!StringUtils.hasText(type)) {
             throw new IllegalArgumentException("审批类型不能为空");
@@ -169,9 +169,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             put("Content-Type", "application/json");
         }};
 
-        Map<String, String> querys = new HashMap<String, String>() {{
-            put("type",type);
-        }};
+        Map<String, String> querys = new HashMap();
+        querys. put("type",type);
+        if ("1".equals(type)) {
+            querys.put("deptId", mainErDepartment);
+        }
 
         String resp = null;
         try {
@@ -205,6 +207,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
             // 3.保存审批人信息到数据库
             List<LdApprove> approversToSave = new ArrayList<>();
+            // 构建审批人json结构   [{"level":1,"ids":"LiuXu"},{"level":2,"ids":"AnXingHe"},{"level":3,"ids":"LiuXu"}]
+            List<JSONObject> approvers = new ArrayList<>();
 
             // 遍历所有审批层级（1, 2, 3...）
             for (String level : result.keySet()) {
@@ -219,6 +223,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                     User user = users.get(i);
                     LdApprove ldApprove = createLdApprove(user, level, formId, type);
                     approversToSave.add(ldApprove);
+
+                    JSONObject approver = new JSONObject();
+                    approver.put("level", level);
+                    approver.put("ids", user.getUserId());
+                    approvers.add(approver);
                 }
             }
 
@@ -230,7 +239,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 throw new RuntimeException("未找到审批人信息");
             }
 
-            return saveSuccess;
+            return JSONObject.toJSONString(approvers);
 
         } catch (Exception e) {
             throw new RuntimeException("处理审批人数据失败: " + e.getMessage(), e);