From 265416db6c1aeb9264fe56c22eae7f2a6b981c29 Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 21 Nov 2025 15:24:04 +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 --- .../bonus/material/basic/domain/ProjUsingExport.java | 2 +- .../material/basic/domain/ProjUsingRecordExport.java | 2 +- .../material/basic/domain/ProjUsingRecordExports.java | 5 +++-- .../mapper/material/basic/ComplexQueryMapper.xml | 10 ++++++++++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingExport.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingExport.java index 8204bf6a..daa9e52d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingExport.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingExport.java @@ -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 = "机具类型") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExport.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExport.java index c65d3fdb..ebec8277 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExport.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExport.java @@ -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") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExports.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExports.java index 641eb335..37f04bb5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExports.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ProjUsingRecordExports.java @@ -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 = "在库数量") diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index 9d718b01..7424e746 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -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' + + AND DATE_FORMAT( sai.start_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + 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) + + AND DATE_FORMAT( lad.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + and bp.pro_id = #{proId} @@ -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' + + AND DATE_FORMAT( lpd.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} + and bp.pro_id = #{proId}