From fab03a0f3ddb356cfd45b53a0bda971765cc4d0a Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 15 Jan 2026 17:34:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SltAgreementReduceController.java       | 10 ++++++++--
 .../settlement/domain/vo/PeriodCostResultVo.java       |  2 ++
 .../material/settlement/SltAgreementInfoMapper.xml     |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java
index 659401ea..800dbe7b 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementReduceController.java
@@ -80,13 +80,19 @@ public class SltAgreementReduceController extends BaseController {
         Date currentDate = new Date();
         PeriodCostQueryDto periodCostQueryDto = new PeriodCostQueryDto();
         periodCostQueryDto.setAgreementId(sltAgreement.getAgreementId());
-
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if (null == sltAgreement.getStartTime()) {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+
             periodCostQueryDto.setStartDate(sdf.parse("2018-01-01 01:00:00"));
+        }else{
+            String formattedStartTime = sdf.format(sltAgreement.getStartTime());
+            periodCostQueryDto.setStartDate(sdf.parse(formattedStartTime));
         }
         if (null == sltAgreement.getEndTime()) {
             periodCostQueryDto.setEndDate(currentDate);
+        }else{
+            String formattedEndTime = sdf.format(sltAgreement.getEndTime());
+            periodCostQueryDto.setEndDate(sdf.parse(formattedEndTime));
         }
 
         List<PeriodCostResultVo> resultVos = sltAgreementInfoService.selectPeriodCostList(periodCostQueryDto);
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/PeriodCostResultVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/PeriodCostResultVo.java
index 0014c802..32d4a24b 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/PeriodCostResultVo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/PeriodCostResultVo.java
@@ -18,6 +18,8 @@ import java.util.Date;
 @ApiModel("区间费用计算结果VO")
 public class PeriodCostResultVo {
 
+    private Long id;
+
     @ApiModelProperty(value = "协议ID")
     private Long agreementId;
 
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
index 05c1fe5e..e07c118d 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
@@ -1667,6 +1667,7 @@
 
     <select id="selectLeasePeriodCostList" parameterType="com.bonus.material.settlement.domain.dto.PeriodCostQueryDto" resultMap="PeriodCostResultMap">
         SELECT
+        sai.id,
         bai.agreement_id, bai.agreement_code, bai.unit_id,
         bu.unit_name,
         bai.project_id,