From 607676d136c2d141c36cb3554a5daad20fd8e8b7 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 29 Jan 2026 15:36:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/push/domain/IwsCostPushBean.java      | 14 +++++++-------
 .../mapper/material/back/BackApplyInfoMapper.xml   |  3 ++-
 2 files changed, 9 insertions(+), 8 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 b673502c..43e620f9 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
@@ -30,11 +30,11 @@ public class IwsCostPushBean implements Serializable {
     private Long parentId;
 
     @ApiModelProperty(value = "分公司")
-    @Excel(name = "分公司", sort = 0)
+    @Excel(name = "分公司", sort = 1)
     private String impUnitName;
 
     // 协议号
-    @Excel(name = "协议号", sort = 1)
+    @Excel(name = "协议号", sort = 0)
     private String agreementCode;
 
     // 协议id
@@ -44,13 +44,13 @@ public class IwsCostPushBean implements Serializable {
 
     private String unitId;
 
-    @Excel(name = "工程名称", sort = 3)
+    @Excel(name = "工程名称", sort = 3, width = 40)
     private String projectName;
 
     @Excel(name = "工程编号", sort = 4)
     private String projectCode;
 
-    @Excel(name = "单位名称", sort = 2)
+    @Excel(name = "单位名称", sort = 2, width = 40)
     private String unitName;
 
     // 物资类型
@@ -115,7 +115,7 @@ public class IwsCostPushBean implements Serializable {
      */
     private String buyPrice;
 
-    @Excel(name = "是否推送", readConverterExp = "0=未推送,1=已推送")
+    //@Excel(name = "是否推送", readConverterExp = "0=未推送,1=已推送")
     private String isPush;
 
     private String money;
@@ -131,7 +131,7 @@ public class IwsCostPushBean implements Serializable {
     @ApiModelProperty(value = "安全工器具是否结算, 0未结算，1=已结算")
     private Integer safetyIsSettlement;
 
-    @Excel(name = "结算类型", readConverterExp = "1=工器具,2=安全工器具")
+    //@Excel(name = "结算类型", readConverterExp = "1=工器具,2=安全工器具")
     private Integer settlementType;
 
     // 结算时间
@@ -177,7 +177,7 @@ public class IwsCostPushBean implements Serializable {
     private BigDecimal pendingNum;
 
     @ApiModelProperty(value = "出库数量")
-    @Excel(name = "出库数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
+    //@Excel(name = "出库数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
     private BigDecimal outNum;
     // 工程id数组
     private String[] projectIds;
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
index da3be0cb..4b5a3fcb 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
@@ -199,7 +199,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     (bai.create_by REGEXP '^[0-9]+$' AND su.user_id = bai.create_by)  -- 数字ID关联
                     OR
                     (NOT bai.create_by REGEXP '^[0-9]+$' AND su.nick_name = bai.create_by)  -- 汉字昵称关联
-                ) and su.del_flag='0'
+                ) and su.del_flag='0' AND su.sign_type IS NOT NULL
+                AND su.sign_url IS NOT NULL
         WHERE
             bai.id = #{id}
         LIMIT 1