From 4a4d4faf3744cdedacf511c6ee1dbb024f6c3bd4 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Mon, 17 Nov 2025 10:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=E6=9C=AC?= =?UTF-8?q?=E6=AC=A1=E4=B8=8B=E6=AC=A1=E6=A3=80=E9=AA=8C=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/domain/MachineHistoryRecordBean.java | 10 ++++++++++ .../mapper/material/basic/ComplexQueryMapper.xml | 2 ++ 2 files changed, 12 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/MachineHistoryRecordBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/MachineHistoryRecordBean.java index 51ef8406..e2240d68 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/MachineHistoryRecordBean.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/MachineHistoryRecordBean.java @@ -85,6 +85,16 @@ public class MachineHistoryRecordBean { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") 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 = "状态") @Excel(name = "当前状态") private String statusName; 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 5b9176e6..5a679c33 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 @@ -100,6 +100,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lai.lease_person AS leaseMan, lai.create_time AS leaseDate, mm.ma_code AS maCode, + mm.this_check_time as checkDate, + mm.next_check_time as nextCheckDate, baif.back_person AS backMan, sai.end_time AS backDate, CASE