From 73195a84c500c8f0f66a9b59ba63d2eb31ff22a9 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Thu, 29 Feb 2024 19:44:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BackApplyController.java       |  2 +-
 .../material/service/BackApplyService.java    |  2 +-
 .../service/impl/BackApplyServiceImpl.java    | 30 +++++++++++--------
 .../mapper/material/BackApplyMapper.xml       |  1 +
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
index eeb19e83..0eda84b2 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
@@ -126,7 +126,7 @@ public class BackApplyController extends BaseController {
      */
     @ApiOperation(value = "退料申请详情修改")
     @PostMapping("/setModify")
-    public AjaxResult setModify(@RequestBody BackApplyInfo bean) {
+    public AjaxResult setModify(@RequestBody List<BackApplyInfo> bean) {
         return backApplyService.setModify(bean);
     }
 
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java
index 3a5b2c21..7178dca0 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java
@@ -77,7 +77,7 @@ public interface BackApplyService {
      * @param bean
      * @return
      */
-    AjaxResult setModify(BackApplyInfo bean);
+    AjaxResult setModify(List<BackApplyInfo> bean);
 
     /**
      * 删除
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
index 238f59a9..467d8b90 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
@@ -153,22 +153,28 @@ public class BackApplyServiceImpl implements BackApplyService {
     }
 
     @Override
-    public AjaxResult setModify(BackApplyInfo bean) {
-        if (!StringUtils.isEmpty(bean.getDetailsId()) && !StringUtils.isEmpty(bean.getNum())) {
-            String[] detailsId = bean.getDetailsId().split(",");
-            String[] num = bean.getNum().split(",");
-            for (int i = 0; i < detailsId.length; i++) {
-                String detailsIds = detailsId[i];
-                String nums = num[i];
-                int re = backApplyMapper.setModify(detailsIds, nums);
-                if (re < 1) {
-                    return AjaxResult.error("修改失败");
+    public AjaxResult setModify(List<BackApplyInfo> bean) {
+        if (CollUtil.isNotEmpty(bean)) {
+            for (BackApplyInfo backApplyInfo : bean) {
+                if (!StringUtils.isEmpty(backApplyInfo.getDetailsId()) && !StringUtils.isEmpty(backApplyInfo.getNum())) {
+                    String[] detailsId = backApplyInfo.getDetailsId().split(",");
+                    String[] num = backApplyInfo.getNum().split(",");
+                    for (int i = 0; i < detailsId.length; i++) {
+                        String detailsIds = detailsId[i];
+                        String nums = num[i];
+                        int re = backApplyMapper.setModify(detailsIds, nums);
+                        if (re < 1) {
+                            return AjaxResult.error("修改失败");
+                        }
+                    }
+                } else {
+                    return AjaxResult.error("未获取到详情id或退料数量");
                 }
             }
-            return AjaxResult.success("修改成功");
         } else {
-            return AjaxResult.error("修改失败,未获取到参数");
+            return AjaxResult.error("未获取到参数");
         }
+        return AjaxResult.success("修改成功");
     }
 
     @Override
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index 4e45882e..a4d13135 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -672,6 +672,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mt2.type_name AS typeName,
             bagi.agreement_code as agreementCode,
             bai.`status` as `status`,
+            bad.id as detailsId,
             bad.pre_num AS num
         FROM
             back_apply_details bad