From 8b72d2358b55b0af38a14c705a071613d84979c3 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Fri, 15 Aug 2025 17:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/service/impl/LeaseApplyInfoServiceImpl.java       | 4 ++--
 .../mapper/material/clz/MaterialLeaseInfoMapper.xml         | 6 ++++++
 .../resources/mapper/material/lease/LeaseTaskMapper.xml     | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
index bb106f0e..91eba15b 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
@@ -539,7 +539,8 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
         // 查询领用出库数据
         List<LeaseApplyInfo> leaseApplyOutList = leaseApplyInfoMapper.selectPublishList(leaseApplyInfo);
         if (!CollectionUtils.isEmpty(leaseApplyOutList)) {
-            for (LeaseApplyInfo applyInfo : leaseApplyOutList) {
+            list.addAll(leaseApplyOutList);
+            for (LeaseApplyInfo applyInfo : list) {
                 if (applyInfo.getPreCountNum().compareTo(applyInfo.getAlNum()) == 0) {
                     applyInfo.setTaskStatus(LeaseTaskStatusEnum.LEASE_TASK_FINISHED.getStatus());
                     applyInfo.setTaskStatusName(LeaseTaskStatusEnum.LEASE_TASK_FINISHED.getStatusName());
@@ -548,7 +549,6 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
                     applyInfo.setTaskStatusName(LeaseTaskStatusEnum.LEASE_TASK_IN_PROGRESS.getStatusName());
                 }
             }
-            list.addAll(leaseApplyOutList);
         }
     }
 
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
index 36618fc7..e222378e 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
@@ -1089,6 +1089,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="publishTask != null and publishTask != ''">
             AND lpd.publish_task = #{publishTask}
         </if>
+        <if test="projectIdList != null  and projectIdList.size() > 0">
+            and bp.external_id in
+            <foreach item="item" collection="projectIdList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY
         lpd.publish_task
         ORDER BY
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
index 71bb137d..599652e4 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
@@ -403,7 +403,8 @@
         sd.dept_name as impUnitName,
         bai.agreement_code
         from
-        lease_apply_info lai
+        sys_workflow_record swr
+        left join lease_apply_info lai on swr.task_id = lai.task_id
         left join tm_task tt on lai.task_id = tt.task_id
         left join lease_apply_details lad on lai.id = lad.parent_id
         LEFT JOIN (SELECT parent_id, unit_id, project_id from lease_publish_details
@@ -417,7 +418,6 @@
         and sda.dict_type = 'lease_apply_task_status'
         left join ma_type mt on lad.type_id = mt.type_id and mt.del_flag = '0'
         left join ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0'
-        left join sys_workflow_record swr on swr.task_id = lai.task_id
             where tt.task_type = '19' and sda.dict_type = 'lease_apply_task_status'
             <if test="code != null  and code != ''">and lai.code = #{code}</if>
             <if test="taskId != null ">and lai.task_id = #{taskId}</if>