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-27 16:23:00 +08:00
parent e9003be200
commit 193a70ab7b
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java
View File

@ -26,7 +26,7 @@ public class UseMaintenanceWarningBean extends BaseEntity {
*/ */
@ApiModelProperty(value = "本次检验日期") @ApiModelProperty(value = "本次检验日期")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "本次检验日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "本次检验日期", dateFormat = "yyyy-MM-dd")
private Date thisCheckTime; private Date thisCheckTime;
/** /**
@ -34,7 +34,7 @@ public class UseMaintenanceWarningBean extends BaseEntity {
*/ */
@ApiModelProperty(value = "下次检验日期") @ApiModelProperty(value = "下次检验日期")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "下次检验日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "下次检验日期", dateFormat = "yyyy-MM-dd")
private Date nextCheckTime; private Date nextCheckTime;
@ApiModelProperty(value = "物资类型") @ApiModelProperty(value = "物资类型")
@ -99,7 +99,7 @@ public class UseMaintenanceWarningBean extends BaseEntity {
* 临检天数 * 临检天数
*/ */
@ApiModelProperty(value = "临检天数") @ApiModelProperty(value = "临检天数")
@Excel(name = "临检天数") @Excel(name = "临检天数", cellType = Excel.ColumnType.NUMERIC)
private Long overDays; private Long overDays;
@ApiModelProperty(value = "开始时间") @ApiModelProperty(value = "开始时间")

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

@ -88,7 +88,10 @@
</if> </if>
) mtm ON mt3.parent_id = mtm.type_id ) mtm ON mt3.parent_id = mtm.type_id
WHERE 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
<if test="externalId != null and externalId != '' "> <if test="externalId != null and externalId != '' ">
and bp.external_id = #{externalId} and bp.external_id = #{externalId}
</if> </if>

4
bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
View File

@ -1462,7 +1462,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bm_project bmp bm_project bmp
LEFT JOIN sys_dept sd ON sd.dept_id = bmp.imp_unit 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 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 LEFT JOIN bm_unit bu ON bu.unit_id = bai.unit_id
AND bu.del_flag = '0' AND bu.del_flag = '0'
WHERE WHERE
@ -1488,7 +1488,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sys_dept sd sys_dept sd
LEFT JOIN bm_project bmp ON sd.dept_id = bmp.imp_unit 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 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 LEFT JOIN bm_unit bu ON bu.unit_id = bai.unit_id
WHERE WHERE
bmp.pro_id IS NOT NULL bmp.pro_id IS NOT NULL