From ce15fd7cce39dacd7ccd63c599ed9e2a6a789544 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 20 Nov 2025 09:09:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=BB=93=E7=AE=97=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SltAgreementInfoController.java       |  2 ++
 .../material/settlement/domain/SltAgreementInfo.java |  3 +++
 .../material/settlement/domain/vo/SltInfoVo.java     |  5 +++++
 .../material/settlement/SltAgreementInfoMapper.xml   | 12 +++++++++++-
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
index ca7777bf..5bd7595f 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
@@ -1717,6 +1717,7 @@ public class SltAgreementInfoController extends BaseController {
 
                     // 查询每个协议的各项费用明细
                     SltInfoVo vo = sltAgreementInfoService.getSltInfoReportBatch(info);
+                    vo.setIsFinish(info.getIsFinish());
                     if (vo != null && !ObjectUtil.isEmpty(vo)) {
                         vo.setAgreementId(info.getAgreementId());
                         vo.setAgreementCode(info.getAgreementCode());
@@ -1793,6 +1794,7 @@ public class SltAgreementInfoController extends BaseController {
 
             // 查询每个协议的各项费用明细
             SltInfoVo vo = sltAgreementInfoService.getSltInfoReportBatch(info);
+            vo.setIsFinish(info.getIsFinish());
             if (vo != null) {
                 vo.setAgreementId(info.getAgreementId());
                 vo.setAgreementCode(info.getAgreementCode());
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java
index 8973d0e6..6e47670a 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementInfo.java
@@ -282,4 +282,7 @@ public class SltAgreementInfo extends BaseEntity {
     @ApiModelProperty(value = "签字类型")
     private String signType;
 
+    /** 工程是否竣工 */
+    @ApiModelProperty(value = "工程是否竣工")
+    private Integer isFinish;
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltInfoVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltInfoVo.java
index b3b22ea7..07336559 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltInfoVo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/vo/SltInfoVo.java
@@ -161,4 +161,9 @@ public class SltInfoVo {
     /** 签字类型 */
     @ApiModelProperty(value = "签字类型")
     private long signType;
+
+    /** 工程是否竣工 */
+    @ApiModelProperty(value = "工程是否竣工")
+    @Excel(name = "工程是否竣工",readConverterExp = "0=未竣工,1=已竣工")
+    private Integer isFinish;
 }
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 cf59621b..3e795149 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
@@ -929,7 +929,11 @@
         WHEN saa.status = '2' THEN '2'
         WHEN saa.status = '3' THEN '3'
         ELSE '0'
-        END as sltStatus
+        END as sltStatus,
+        CASE
+        WHEN bp.actual_end_date is not null THEN '1'
+        ELSE '0'
+        END as isFinish
         FROM bm_agreement_info bai
         INNER JOIN bm_unit bui ON bui.unit_id = bai.unit_id AND bui.type_id != '1731'
         LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id
@@ -957,6 +961,12 @@
         <if test="projectName != null and projectName != ''">
             AND bp.pro_name LIKE CONCAT('%', #{projectName}, '%')
         </if>
+        <if test="isFinish != null and isFinish == 1">
+            AND bp.actual_end_date is not null
+        </if>
+        <if test="isFinish != null and isFinish == 0">
+            AND bp.actual_end_date is null
+        </if>
         ORDER BY bai.create_time DESC
     </select>