From 2dc94f20b86931ee03fb7f4936c9a9013fa66fcf Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Sat, 11 Oct 2025 17:44:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E6=97=A0=E6=B3=95=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E5=B7=B2=E7=BB=93=E7=AE=97=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/service/impl/LeaseTaskServiceImpl.java |  4 ++++
 .../mapper/material/lease/LeaseTaskMapper.xml    | 16 ++++++++++------
 .../settlement/SltAgreementInfoMapper.xml        |  4 ++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
index 0e45e01f..d56dc188 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
@@ -1072,6 +1072,10 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
         try {
             int result = 0;
             LeaseApplyInfo leaseApplyInfo = leaseApplyRequestVo.getLeaseApplyInfo();
+            TmTaskAgreement taskAgreement = mapper.getAgreementInfo(leaseApplyInfo);
+            if (taskAgreement == null) {
+                return AjaxResult.error("该协议已结算，无法发布，请重新选择其他领用单位发布");
+            }
             List<LeaseApplyDetails> leaseApplyDetailsList = leaseApplyRequestVo.getLeaseApplyDetailsList();
             Long parentId = leaseApplyDetailsList.get(0).getParentId();
             int thisMonthMaxOrder = mapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth());
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 b2f82b47..8832f65b 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
@@ -1152,12 +1152,16 @@
     </delete>
 
     <select id="getAgreementInfo" resultType="com.bonus.material.task.domain.TmTaskAgreement">
-        select
-            agreement_id as agreementId
-        from
-            bm_agreement_info
-        where unit_id = #{unitId} and project_id = #{projectId}
-        limit 1
+        SELECT
+            bai.agreement_id AS agreementId
+        FROM
+            bm_agreement_info bai
+            LEFT JOIN slt_agreement_info sai ON bai.agreement_id = sai.agreement_id
+        WHERE
+            sai.is_slt = '0'
+          AND bai.unit_id = #{unitId}
+          AND bai.project_id = #{projectId}
+        LIMIT 1
     </select>
     <select id="selectById" resultType="com.bonus.material.basic.domain.BmProject">
         select pro_id as proId,
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 84f8744a..9981d7b8 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
@@ -1440,8 +1440,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ma_machine mi
             INNER JOIN slt_agreement_info sai ON mi.ma_id = sai.ma_id AND sai.end_time is null AND sai.status = '0'
             INNER JOIN ma_type mt ON sai.type_id = mt.type_id AND mt.`level` = '4'
-        set
-            mi.status = '18', mi.update_time = NOW()
+            set
+                mi.ma_status = '18', mi.update_time = NOW()
         where
             sai.agreement_id = #{agreementId} AND mt.jiju_type = #{settlementType}
     </update>