From 3bf0bb85bf4d2cfec242f64443183b16ab3361b7 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Tue, 6 Jan 2026 16:40:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=85=8D=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../record/DerateRecordQueryMapper.xml        | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml
index 4524bcd8..75ef612d 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml
@@ -7,15 +7,15 @@
     <select id="getList" resultType="com.bonus.material.settlement.domain.SltAgreementReduceRecord">
         SELECT
         sra.id as id,
+        sra.code as code,
         sra.create_time as createTime,
         su.user_name as createBy,
         bu.unit_name as unitName,
         bp.pro_name as projectName,
-        SUM(srd.lease_price * srd.num) as leasePrice,
-        SUM(srd.lease_money) as leaseMoney,
         swr.workflow_status as status,
-        a.leaseMoneyAll as leaseMoneyAll,
-        sd.dept_name AS impUnitName
+        sd.dept_name AS impUnitName,
+        a.leaseMoney,
+        a.leaseMoneyAll
         FROM
         slt_reduce_apply sra
         LEFT JOIN slt_reduce_details srd on sra.id=srd.apply_id
@@ -28,13 +28,14 @@
         LEFT JOIN
         (
         SELECT
-        sra.agreement_id as agreementId,
-        SUM(srd.lease_money) as leaseMoneyAll
+        sra.id as id,
+        ROUND(SUM(srd.lease_price * srd.num * (DATEDIFF(srd.end_time, srd.start_time) + 1)), 2) as leaseMoney,
+        ROUND(SUM(srd.lease_money), 2) as leaseMoneyAll
         FROM
         slt_reduce_apply sra
         LEFT JOIN slt_reduce_details srd on sra.id=srd.apply_id
-        GROUP BY sra.agreement_id
-        ) a on a.agreementId=sra.agreement_id
+        GROUP BY sra.id
+        ) a on a.id=sra.id
         where 1=1
 
         <if test="startTime != null and endTime != ''">
@@ -53,9 +54,6 @@
         <if test="status != null and status!=''">
             AND swr.workflow_status = #{status}
         </if>
-        <if test="taskStatus !=null">
-            AND sra.status = #{taskStatus}
-        </if>
         GROUP BY sra.id
         ORDER BY sra.create_time DESC
     </select>