From 6b6c2f6daaaca900c6e9718fa49822531ae98524 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Fri, 23 Aug 2024 10:14:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/base/api/domain/MaType.java       | 2 +-
 .../purchase/service/impl/BpmPurchaseAcceptServiceImpl.java   | 3 ++-
 .../src/main/resources/mapper/BpmPurchaseAcceptMapper.xml     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaType.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaType.java
index 6d5af26..0868b76 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaType.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaType.java
@@ -72,7 +72,7 @@ public class MaType extends BaseEntity implements Serializable {
      */
     private Integer leasePrice;
     /**
-     * 管理类型（0是编码 1数量和编码 2数量）
+     * 管理类型（0是编码 1数量）
      */
     private String manageType;
     /**
diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java
index 5f58144..7463542 100644
--- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java
+++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java
@@ -66,10 +66,11 @@ public class BpmPurchaseAcceptServiceImpl implements BpmPurchaseAcceptService {
         //只有任务状态为待验收时，方可批量验收合格
         if (purchaseDto.getId() != null) {
             String[] split = purchaseDto.getId().split(",");
-            ArrayList<Integer> taskIdList = new ArrayList<>();
+            List<Integer> taskIdList = new ArrayList<>();
             for (int i = 0; i < split.length; i++) {
                 taskIdList.add(Integer.parseInt(split[i]));
             }
+            purchaseDto.setTaskIds(taskIdList);
             List<Integer> statusList = mapper.selectStatus(purchaseDto);
             if (CollectionUtils.isNotEmpty(statusList)) {
                 for (Integer status : statusList) {
diff --git a/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml
index 0a1984d..16b0836 100644
--- a/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml
+++ b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectStatus" resultType="java.lang.Integer">
-        select status from bpm_task bt
+        select status from bpm_task
         where id in
         <foreach collection="taskIds" item="taskId" open="(" separator="," close=")">
             #{taskId}
@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="select" resultType="com.bonus.purchase.vo.PurchaseAcceptVo">
         select task_id as id,
         status as status
-        from bpm_purchase_info bp
+        from bpm_purchase_info
         where id in
         <foreach collection="array" item="taskId" open="(" separator="," close=")">
             #{taskId}