From a9e22710b4e6f4828e1543ba17be0626ca17831c Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Thu, 23 Jan 2025 16:40:53 +0800
Subject: [PATCH] =?UTF-8?q?i=E7=9A=96=E9=80=81=E6=8E=A8=E9=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../push/controller/IwsCostPushController.java      |  9 +++------
 .../bonus/material/push/domain/IwsCostPushBean.java | 13 +++++++------
 .../material/push/mapper/IwsCostPushMapper.java     |  4 ++++
 .../mapper/material/push/IwsCostPushMapper.xml      | 12 +++++++++---
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java
index bac34bd1..2789ead7 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java
@@ -6,10 +6,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.material.push.domain.IwsCostPushBean;
 import com.bonus.material.push.service.IwsCostPushService;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -35,8 +32,8 @@ public class IwsCostPushController extends BaseController {
      * @param obj 查询条件
      */
     @ApiOperation("查询协议推送匹配列表--分页")
-    @PostMapping("/findAgreementPushMatchList")
-    public TableDataInfo findAgreementPushMatchList(@RequestBody IwsCostPushBean obj) {
+    @GetMapping("/findAgreementPushMatchList")
+    public TableDataInfo findAgreementPushMatchList(IwsCostPushBean obj) {
         startPage();
         List<IwsCostPushBean> list = iwsCostPushService.findAgreement(obj);
         return getDataTable(list);
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java
index a5a10485..dc8bfd03 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java
@@ -23,7 +23,7 @@ public class IwsCostPushBean implements Serializable {
     private String id;
 
     // 协议号
-    @Excel(name = "协议号")
+    @Excel(name = "协议号", sort = 1)
     private String agreementCode;
 
     // 协议id
@@ -33,13 +33,13 @@ public class IwsCostPushBean implements Serializable {
 
     private String unitId;
 
-    @Excel(name = "工程名称")
+    @Excel(name = "工程名称", sort = 3)
     private String projectName;
 
-    @Excel(name = "工程编号")
+    @Excel(name = "工程编号", sort = 4)
     private String projectCode;
 
-    @Excel(name = "单位名称")
+    @Excel(name = "单位名称", sort = 2)
     private String unitName;
 
     private String typeName;
@@ -80,15 +80,16 @@ public class IwsCostPushBean implements Serializable {
     private String year;
 
     // 是否结算
-    @Excel(name = "是否结算", readConverterExp = "0=未结算,1=已结算")
+    @Excel(name = "是否结算", readConverterExp = "0=未结算,1=已结算", sort = 6)
     private Byte isSettlement = 0;
 
     // 结算时间
-    @Excel(name = "结算时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "结算时间", dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 7)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime settlementTime;
 
     // 是否匹配
+    @Excel(name = "是否匹配", readConverterExp = "0=未匹配,1=已匹配", sort = 5)
     private Byte isMatch = 0;
 
     private String userName;
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/IwsCostPushMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/IwsCostPushMapper.java
index 5ac4c74b..8a2e83c2 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/IwsCostPushMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/IwsCostPushMapper.java
@@ -20,4 +20,8 @@ public interface IwsCostPushMapper {
      */
     List<IwsCostPushBean> findAgreement(IwsCostPushBean o);
 
+    /**
+     * 更新协议push状态
+     */
+    int updateAgreementIsPush(IwsCostPushBean o);
 }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml
index 26be1c13..04cbf726 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml
@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="findAgreement" resultType="com.bonus.material.push.domain.IwsCostPushBean">
         SELECT
-            bp.PRO_ID AS projectId,
+            bp.pro_id AS projectId,
             bp.pro_name AS projectName,
             bp.pro_code AS projectCode,
             bu.unit_name AS unitName,
@@ -36,6 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-
-
+    <update id="updateAgreementIsPush">
+        UPDATE bm_agreement_info
+        SET is_push = #{isPush}
+        WHERE agreement_id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 </mapper>
\ No newline at end of file