bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
mashuai 2026-01-29 15:36:42 +08:00
parent b73e5a6cd0
commit 607676d136
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java
View File

@ -30,11 +30,11 @@ public class IwsCostPushBean implements Serializable {
private Long parentId; private Long parentId;
@ApiModelProperty(value = "分公司") @ApiModelProperty(value = "分公司")
@Excel(name = "分公司", sort = 0) @Excel(name = "分公司", sort = 1)
private String impUnitName; private String impUnitName;
// 协议号 // 协议号
@Excel(name = "协议号", sort = 1) @Excel(name = "协议号", sort = 0)
private String agreementCode; private String agreementCode;
// 协议id // 协议id
@ -44,13 +44,13 @@ public class IwsCostPushBean implements Serializable {
private String unitId; private String unitId;
@Excel(name = "工程名称", sort = 3) @Excel(name = "工程名称", sort = 3, width = 40)
private String projectName; private String projectName;
@Excel(name = "工程编号", sort = 4) @Excel(name = "工程编号", sort = 4)
private String projectCode; private String projectCode;
@Excel(name = "单位名称", sort = 2) @Excel(name = "单位名称", sort = 2, width = 40)
private String unitName; private String unitName;
// 物资类型 // 物资类型
@ -115,7 +115,7 @@ public class IwsCostPushBean implements Serializable {
*/ */
private String buyPrice; private String buyPrice;
@Excel(name = "是否推送", readConverterExp = "0=未推送,1=已推送") //@Excel(name = "是否推送", readConverterExp = "0=未推送,1=已推送")
private String isPush; private String isPush;
private String money; private String money;
@ -131,7 +131,7 @@ public class IwsCostPushBean implements Serializable {
@ApiModelProperty(value = "安全工器具是否结算, 0未结算，1=已结算") @ApiModelProperty(value = "安全工器具是否结算, 0未结算，1=已结算")
private Integer safetyIsSettlement; private Integer safetyIsSettlement;
@Excel(name = "结算类型", readConverterExp = "1=工器具,2=安全工器具") //@Excel(name = "结算类型", readConverterExp = "1=工器具,2=安全工器具")
private Integer settlementType; private Integer settlementType;
// 结算时间 // 结算时间
@ -177,7 +177,7 @@ public class IwsCostPushBean implements Serializable {
private BigDecimal pendingNum; private BigDecimal pendingNum;
@ApiModelProperty(value = "出库数量") @ApiModelProperty(value = "出库数量")
@Excel(name = "出库数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) //@Excel(name = "出库数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
private BigDecimal outNum; private BigDecimal outNum;
// 工程id数组 // 工程id数组
private String[] projectIds; private String[] projectIds;

3
bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
View File

@ -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关联 (bai.create_by REGEXP '^[0-9]+$' AND su.user_id = bai.create_by) -- 数字ID关联
OR OR
(NOT bai.create_by REGEXP '^[0-9]+$' AND su.nick_name = bai.create_by) -- 汉字昵称关联 (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 WHERE
bai.id = #{id} bai.id = #{id}
LIMIT 1 LIMIT 1