From c63a3cf187e3edcd65bfec98933ac22684199479 Mon Sep 17 00:00:00 2001
From: gmhao <1285330039@qq.com>
Date: Tue, 19 Dec 2023 09:44:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E9=87=8F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AgreementInfoController.java   |  4 +--
 .../material/mapper/AgreementInfoMapper.java  |  2 +-
 .../service/AgreementInfoService.java         |  2 +-
 .../impl/AgreementInfoServiceImpl.java        |  4 +--
 .../mapper/material/AgreementInfoMapper.xml   | 30 +++++++++----------
 5 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java
index 1a30e19b..cec70649 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/AgreementInfoController.java
@@ -86,8 +86,8 @@ public class AgreementInfoController extends BaseController {
      */
     @ApiOperation(value = "协议管理-删除")
     @PostMapping("/remove")
-    public AjaxResult deleteByIds(String id)
+    public AjaxResult deleteByIds(@Validated @RequestBody AgreementInfo bean)
     {
-        return toAjax(agreementInfoService.deleteByIds(id));
+        return toAjax(agreementInfoService.deleteByIds(bean));
     }
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/AgreementInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/AgreementInfoMapper.java
index 346e43a9..3a2fc3fc 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/AgreementInfoMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/AgreementInfoMapper.java
@@ -24,7 +24,7 @@ public interface AgreementInfoMapper {
 
     int update(AgreementInfo bean);
 
-    int deleteByIds(String id);
+    int deleteByIds(AgreementInfo bean);
 
     AgreementInfo getAgreementInfoId(AgreementInfo bean);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/AgreementInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/AgreementInfoService.java
index c40529c6..5fd9571d 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/AgreementInfoService.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/AgreementInfoService.java
@@ -19,7 +19,7 @@ public interface AgreementInfoService {
 
     int update(AgreementInfo bean);
 
-    int deleteByIds(String id);
+    int deleteByIds(AgreementInfo bean);
 
     AgreementInfo getAgreementInfoId(AgreementInfo bean);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java
index 32bdabf2..215777f5 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java
@@ -48,8 +48,8 @@ public class AgreementInfoServiceImpl implements AgreementInfoService {
     }
 
     @Override
-    public int deleteByIds(String id) {
-        return agreementInfoMapper.deleteByIds(id);
+    public int deleteByIds(AgreementInfo bean) {
+        return agreementInfoMapper.deleteByIds(bean);
     }
 
     @Override
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml
index cc71f0ad..74c365f9 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <update id="deleteByIds">
-        UPDATE bm_agreement_info SET status = '0' WHERE agreement_id = #{id}
+        UPDATE bm_agreement_info SET status = '0' WHERE agreement_id = #{agreementId}
     </update>
 
     <select id="getAgreementInfoAll" resultType="com.bonus.sgzb.material.domain.AgreementInfo">
@@ -103,22 +103,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM bm_agreement_info bai
          LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id
          LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
+        where bai.status = '1'
+        <if test="keyWord != null  and keyWord != ''">
+            and bai.contract_code like concat('%', #{keyWord}, '%')
+        </if>
 
-        <where>
-            <if test="keyWord != null  and keyWord != ''">
-                and bai.contract_code like concat('%', #{keyWord}, '%')
-            </if>
-
-            <if test="agreementCode != null  and agreementCode != ''">
-                and bai.agreement_code like concat('%', #{agreementCode}, '%')
-            </if>
-            <if test="unitId != null  and unitId != ''">
-                and bui.unit_id = #{unitId}
-            </if>
-            <if test="projectId != null  and projectId != ''">
-                and bp.lot_id = #{projectId}
-            </if>
-        </where>
+        <if test="agreementCode != null  and agreementCode != ''">
+            and bai.agreement_code like concat('%', #{agreementCode}, '%')
+        </if>
+        <if test="unitId != null  and unitId != ''">
+            and bui.unit_id = #{unitId}
+        </if>
+        <if test="projectId != null  and projectId != ''">
+            and bp.lot_id = #{projectId}
+        </if>
     </select>
 
     <select id="getUnitList" resultType="com.bonus.sgzb.material.domain.AgreementInfo">