From 193a70ab7b33b6b602e6baf9912b9f7041b9fed1 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 27 Jan 2026 16:23:00 +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 --- .../warningAnalysis/domain/UseMaintenanceWarningBean.java | 6 +++--- .../resources/mapper/material/basic/ComplexQueryMapper.xml | 5 ++++- .../main/resources/mapper/material/common/SelectMapper.xml | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java index f0278416..7e14d6bd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java @@ -26,7 +26,7 @@ public class UseMaintenanceWarningBean extends BaseEntity { */ @ApiModelProperty(value = "本次检验日期") @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "本次检验日期", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "本次检验日期", dateFormat = "yyyy-MM-dd") private Date thisCheckTime; /** @@ -34,7 +34,7 @@ public class UseMaintenanceWarningBean extends BaseEntity { */ @ApiModelProperty(value = "下次检验日期") @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "下次检验日期", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "下次检验日期", dateFormat = "yyyy-MM-dd") private Date nextCheckTime; @ApiModelProperty(value = "物资类型") @@ -99,7 +99,7 @@ public class UseMaintenanceWarningBean extends BaseEntity { * 临检天数 */ @ApiModelProperty(value = "临检天数") - @Excel(name = "临检天数") + @Excel(name = "临检天数", cellType = Excel.ColumnType.NUMERIC) private Long overDays; @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 f9b25a8a..dcd9a1e5 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 @@ -88,7 +88,10 @@ ) mtm ON mt3.parent_id = mtm.type_id WHERE - sai.is_slt = '0' + sai.`status` = '0' and sai.`is_slt` = '0' + AND (sai.source = 1 OR sai.source is NULL) + AND sai.end_time IS NULL + AND sai.back_id IS NULL and bp.external_id = #{externalId} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml index 9ac5edf2..f2984ac1 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml @@ -1462,7 +1462,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bm_project bmp LEFT JOIN sys_dept sd ON sd.dept_id = bmp.imp_unit LEFT JOIN bm_agreement_info bai ON bai.project_id = bmp.pro_id - AND bai.`status` = '1' and bai.is_slt = '0' + AND bai.`status` = '1' LEFT JOIN bm_unit bu ON bu.unit_id = bai.unit_id AND bu.del_flag = '0' WHERE @@ -1488,7 +1488,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sys_dept sd LEFT JOIN bm_project bmp ON sd.dept_id = bmp.imp_unit LEFT JOIN bm_agreement_info bai ON bai.project_id = bmp.pro_id - AND bai.`status` = '1' and bai.is_slt = '0' + AND bai.`status` = '1' LEFT JOIN bm_unit bu ON bu.unit_id = bai.unit_id WHERE bmp.pro_id IS NOT NULL