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

优化

This commit is contained in:
mashuai 2025-11-21 15:24:04 +08:00
parent 769571e04b
commit 265416db6c
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingExport.java
View File

@ -38,7 +38,7 @@ public class ProjUsingExport implements Serializable {
private Integer proId;
@ApiModelProperty(value = "工程名称")
@Excel(name = "工程名称")
@Excel(name = "工程名称", width = 30)
private String proName;
@ApiModelProperty(value = "机具类型")

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExport.java
View File

@ -34,7 +34,7 @@ public class ProjUsingRecordExport implements Serializable {
private Integer proId;
@ApiModelProperty(value = "工程名称")
@Excel(name = "工程名称")
@Excel(name = "工程名称", width = 30)
private String proName;
@ApiModelProperty(value = "往来单位Id")

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExports.java
View File

@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import java.io.Serializable;
import java.math.BigDecimal;
@ -33,7 +34,7 @@ public class ProjUsingRecordExports implements Serializable {
private Integer proId;
@ApiModelProperty(value = "工程名称")
@Excel(name = "工程名称")
@Excel(name = "工程名称", width = 30)
private String proName;
@ApiModelProperty(value = "往来单位Id")
@ -81,7 +82,7 @@ public class ProjUsingRecordExports implements Serializable {
private String diffNum;
@ApiModelProperty(value = "在用数量")
@Excel(name = "在用数量")
@Excel(name = "在用数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
private BigDecimal usNum;
@ApiModelProperty(value = "在库数量")

10
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
View File

@ -912,6 +912,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN bm_project bp on bp.pro_id=bai.project_id
WHERE
sai.`status` = '0'
AND (sai.source = 1 OR sai.source is NULL)
AND sai.`is_slt` = '0'
AND sai.end_time IS NULL
AND sai.back_id IS NULL
@ -1978,6 +1979,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sai.is_slt = '0'
and bp.pro_name is not null
and mt.del_flag='0'
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( sai.start_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
<if test="keyWord != null and keyWord != ''">
and (
mt2.type_name like concat('%', #{keyWord}, '%') or
@ -2029,6 +2033,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and mt.del_flag=0
and tt.task_type = '2'
and tt.task_status in (3, 4)
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( lad.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
<if test="proId != null">
and bp.pro_id = #{proId}
</if>
@ -2076,6 +2083,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.pro_name is not null
and mt.del_flag='0'
and tt.task_type = '19'
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND DATE_FORMAT( lpd.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
</if>
<if test="proId != null">
and bp.pro_id = #{proId}
</if>