From a7c1b484ce3a65a3554dda766f787635358f698f Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Mon, 13 Mar 2023 08:41:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PageController.java                  | 10 ++++------
 .../service/impl/DepositoryRecordServiceImpl.java   |  5 +++--
 .../dreamchaser/depository_manage/TestForOther.java | 13 ++++++++++++-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
index 52bd6482..58894fbe 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -296,12 +296,10 @@ public class PageController {
             mv.setViewName("pages/other/welcome");
 
         }
-        Map<String, Object> map = new HashMap<String, Object>(2) {
-            {
-                put("begin", 0);
-                put("size", 6);
-            }
-        };
+        Map<String, Object> map = new HashMap<>();
+        map.put("begin", 0);
+        map.put("size", 6);
+
         mv.addObject("depositoryCount", depositoryService.findAllCountByNoDelete());
         mv.addObject("allPrice", materialService.findAllPriceNoDelete());
         mv.addObject("allMaterial", materialService.findMaterialCount(new HashMap<>()));
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index d4dbc63d..8e4d8b0c 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -2079,6 +2079,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
         // 如果同意
         for (String sid : split) {
+            boolean flagForIn = true;
             if ("2".equals(spStatus)) {
                 map.put("approverPass", 1);
                 map.put("state", "已入库");
@@ -2086,12 +2087,12 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 // 如果驳回
                 map.put("state", "驳回");
                 map.put("approverPass", 2);
-                break;
+                flagForIn = false;
             }
 
             // 用于标志当前处理的入库申请是否为组合入库下的申请
             boolean flagForGroupInfoInDepository = false; // 默认不是
-            if (!"".equals(sid)) {
+            if (!"".equals(sid) && flagForIn) {
                 Integer id = ObjectFormatUtil.toInteger(sid.trim());
                 // 获取具体入库订单
                 ApplicationInRecordP recordP = depositoryRecordMapper.findApplicationInRecordPById(id);
diff --git a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
index f8a9390a..67b41b56 100644
--- a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
+++ b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
@@ -3,6 +3,10 @@ package com.dreamchaser.depository_manage;
 import com.dreamchaser.depository_manage.entity.Depository;
 import com.dreamchaser.depository_manage.entity.MaterialType;
 import com.dreamchaser.depository_manage.mapper.DepositoryMapper;
+import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo;
+import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details;
+import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver;
+import com.dreamchaser.depository_manage.service.DepositoryRecordService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,8 +27,15 @@ public class TestForOther {
     @Autowired
     RedisTemplate<String, String> redisTemplate;
 
+    @Autowired
+    DepositoryRecordService depositoryRecordService;
+
     @Test
     public void run() {
-        System.out.println(Math.ceil(8.3));
+        ApprovalInfo_Details approvalInfo_details = new ApprovalInfo_Details();
+        ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
+        approver.setUserId("PangFuZhen");
+        approvalInfo_details.setApprover(approver);
+        depositoryRecordService.reviewByQyWxApprovalOut("1", approvalInfo_details, "ebc12ec71c6571ad86cd5497581e2262", "2", "202303130012", false, 2);
     }
 }