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

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;

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