From f795f9fcd999f355b84ca3fa27d2f045553f0aff Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Tue, 30 Sep 2025 11:55:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=8E=A8=E9=80=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/push/domain/IwsCostPushBean.java   |  2 ++
 .../mapper/material/push/IwsCostPushMapper.xml        | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

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 ae62548b..49cdeaa2 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
@@ -100,6 +100,8 @@ public class IwsCostPushBean implements Serializable {
     @ApiModelProperty(value = "结算月份表主键ID")
     private Integer taskId;
 
+    private String name;
+
     private String type;
 
     /**
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 79b7db80..d0299e7a 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
@@ -468,7 +468,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         pmi.leaseNum as num,
         pmi.leaseDate as leaseDate,
         pmi.returnDate as backDate,
-        pmi.leasePrice as buyPrice,
+        pmi.leasePrice as leasePrice,
         pmi.leaseMoney as money,
         cpm.month as month,
         1 as type,
@@ -506,7 +506,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mt2.type_name as typeName,
             mt.type_name as modelName,
             sad.num as num,
-            sad.price as buyPrice,
+            sad.price as leasePrice,
             sad.money as money,
             #{type} as type,
             1 as category,
@@ -582,7 +582,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         pmi.leaseNum as num,
         pmi.leaseDate as leaseDate,
         pmi.returnDate as backDate,
-        pmi.leasePrice as buyPrice,
+        pmi.leasePrice as leasePrice,
         pmi.leaseMoney as money,
         cpm.month as month,
         1 as type,
@@ -626,7 +626,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mt2.type_name as typeName,
         mt.type_name as modelName,
         sad.num as num,
-        sad.price as buyPrice,
+        sad.price as leasePrice,
         sad.money as money,
         #{type} as type,
         2 as category,
@@ -676,7 +676,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         pmi.buy_price as netPrice,
         pmi.money as cost,
         cpm.month as month,
-        1 as type,
+        mt2.type_name as name,
+        mt1.type_name as type,
         2 as category,
         #{submitUser} as submitUser