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

增加导出本次下次检验时间

This commit is contained in:
bonus 2025-11-17 10:53:37 +08:00
parent 59b187558e
commit 4a4d4faf37
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/MachineHistoryRecordBean.java
View File

@ -85,6 +85,16 @@ public class MachineHistoryRecordBean {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date backDate; private Date backDate;
@ApiModelProperty(value = "本次检验时间")
@Excel(name = "本次检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date checkDate;
@ApiModelProperty(value = "下次检验时间")
@Excel(name = "下次检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date nextCheckDate;
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
@Excel(name = "当前状态") @Excel(name = "当前状态")
private String statusName; private String statusName;

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

@ -100,6 +100,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lai.lease_person AS leaseMan, lai.lease_person AS leaseMan,
lai.create_time AS leaseDate, lai.create_time AS leaseDate,
mm.ma_code AS maCode, mm.ma_code AS maCode,
mm.this_check_time as checkDate,
mm.next_check_time as nextCheckDate,
baif.back_person AS backMan, baif.back_person AS backMan,
sai.end_time AS backDate, sai.end_time AS backDate,
CASE CASE