From 9e2fa8109e25aee86196dd5e745911dbe29488a4 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 5 Sep 2025 09:55:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/push/ProDataUseInfoMapper.xml    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
index 8d18ff28..1ba0c9f7 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
@@ -264,16 +264,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getCompletionNotRefunded" resultType="com.bonus.material.push.domain.MachineInfoBean">
         select
-            count(bp.pro_id) as num,
+            bp.pro_center as proCenter,
+            count(bp.pro_id) num,
+            mt2.type_id as typeId,
             sd.dept_name as deptName,
             sd.dept_id as deptId
-        from bm_project bp
+        from slt_agreement_info sai
+                 left join bm_agreement_info bai on sai.agreement_id = bai.agreement_id
+                 left join bm_project bp on bai.project_id = bp.pro_id
                  left join sys_dept sd on bp.imp_unit = sd.dept_id
-        where bp.external_id is not null
-        <if test="deptName != null and deptName != ''">
-            and sd.dept_name = #{deptName}
-        </if>
-        GROUP BY bp.imp_unit
+                 left join ma_type mt on sai.type_id = mt.type_id
+                 left join ma_type mt2 on mt.parent_id = mt2.type_id
+        where sai.is_slt = 0 and sai.end_time is null and bp.actual_end_date is not null and bp.pro_center is not null and
+              <if test="deptName != null">
+                  sd.dept_name = #{deptName}
+              </if>
+        GROUP BY sd.dept_id
     </select>
     <select id="getCompletionNotRefundedDetails" resultType="com.bonus.material.push.domain.MachineInfoBean">
         select