Merge branch 'dev-szl' into dev

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/controller/RecordsMasterCheckController.java

@@ -26,7 +26,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -105,4 +107,17 @@ public class RecordsMasterCheckController extends JeecgController<RecordsMasterC
         return Result.OK(new ArrayList<>());
     }
 
+    /**
+     * 设备检查记录导出excel
+     * @param request
+     * @param recordsMasterCheck
+     * @return
+     */
+    @AutoLog(value = "设备检查记录导出excel")
+    @ApiOperation(value = "设备检查记录导出excel", notes = "设备检查记录导出excel")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request,RecordsMasterCheck recordsMasterCheck) {
+        return super.exportXls(request, recordsMasterCheck, RecordsMasterCheck.class, "道床使用情况检查");
+    }
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/RecordsMasterCheckDTO.java

 package org.jeecg.modules.checkData.equipmentCheckData.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -30,12 +32,16 @@ public class RecordsMasterCheckDTO {
     private String createBy;
 
     @ApiModelProperty("创建日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty("更新人")
     private String updateBy;
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
     @ApiModelProperty("检查批次编号")
@@ -78,12 +84,16 @@ public class RecordsMasterCheckDTO {
     private String checkBy;
 
     @ApiModelProperty("检查日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date checkTime;
 
     @ApiModelProperty("审核人姓名")
     private String verifyBy;
 
     @ApiModelProperty("审核时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date verifyTime;
 
     @ApiModelProperty("是否删除（0：未删除；1：已删除）")

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/dto/TrackBedManagementCheckDTO.java

 package org.jeecg.modules.checkData.equipmentCheckData.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -29,12 +31,16 @@ public class TrackBedManagementCheckDTO {
     private String createBy;
 
     @ApiModelProperty("创建日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty("更新人")
     private String updateBy;
 
     @ApiModelProperty("更新时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
     @ApiModelProperty("设备检查记录主表id->外键")

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/RecordsMasterCheck.java

@@ -6,10 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -37,6 +41,8 @@ public class RecordsMasterCheck implements Serializable {
 
     @ApiModelProperty("创建日期")
     @TableField("create_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty("更新人")
@@ -45,14 +51,18 @@ public class RecordsMasterCheck implements Serializable {
 
     @ApiModelProperty("更新时间")
     @TableField("update_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
+    @Excel(name = "检查批次编号", width = 15, orderNum = "1")
     @ApiModelProperty("检查批次编号")
     @TableField("ek_code")
     private String ekCode;
 
     @ApiModelProperty("工单编号")
     @TableField("work_code")
+    @Excel(name = "工单编号", width = 15, orderNum = "2")
     private String workCode;
 
     @ApiModelProperty("轨距水平尺编号")
@@ -65,6 +75,7 @@ public class RecordsMasterCheck implements Serializable {
 
     @ApiModelProperty("检查区间名称")
     @TableField("subway_section_name")
+    @Excel(name = "检查区间", width = 15, orderNum = "3")
     private String subwaySectionName;
 
     @ApiModelProperty("所属线路id")
@@ -73,6 +84,7 @@ public class RecordsMasterCheck implements Serializable {
 
     @ApiModelProperty("所属线路名称")
     @TableField("light_rail_name")
+    @Excel(name = "所属线路", width = 15, orderNum = "4")
     private String lightRailName;
 
     @ApiModelProperty("所属线别id")
@@ -81,34 +93,44 @@ public class RecordsMasterCheck implements Serializable {
 
     @ApiModelProperty("所属线别名称")
     @TableField("line_alias_name")
+    @Excel(name = "所属线路", width = 15, orderNum = "5")
     private String lineAliasName;
 
     @ApiModelProperty("起始里程")
     @TableField("starting_mileage")
+    @Excel(name = "起始里程", width = 15, orderNum = "6")
     private BigDecimal startingMileage;
 
     @ApiModelProperty("终点里程")
     @TableField("end_mileage")
+    @Excel(name = "终点里程", width = 15, orderNum = "7")
     private BigDecimal endMileage;
 
     @ApiModelProperty("备注")
     @TableField("remark")
+    @Excel(name = "备注", width = 15, orderNum = "12")
     private String remark;
 
     @ApiModelProperty("检查人姓名")
     @TableField("check_by")
+    @Excel(name = "检查人姓名", width = 15, orderNum = "8")
     private String checkBy;
 
     @ApiModelProperty("检查日期")
     @TableField("check_time")
+    @Excel(name = "检查日期", width = 15, format = "yyyy-MM-dd", orderNum = "9")
     private Date checkTime;
 
     @ApiModelProperty("审核人姓名")
     @TableField("verify_by")
+    @Excel(name = "审核人姓名", width = 15, orderNum = "10")
     private String verifyBy;
 
     @ApiModelProperty("审核时间")
     @TableField("verify_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核日期", width = 15, format = "yyyy-MM-dd", orderNum = "11")
     private Date verifyTime;
 
     @ApiModelProperty("是否删除（0：未删除；1：已删除）")

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/entity/TrackBedManagementCheck.java

@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -36,6 +39,8 @@ public class TrackBedManagementCheck implements Serializable {
 
     @ApiModelProperty("创建日期")
     @TableField("create_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty("更新人")
@@ -44,6 +49,8 @@ public class TrackBedManagementCheck implements Serializable {
 
     @ApiModelProperty("更新时间")
     @TableField("update_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
     @ApiModelProperty("设备检查记录主表id->外键")

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/RecordsMasterCheckVO.java

@@ -2,11 +2,13 @@ package org.jeecg.modules.checkData.equipmentCheckData.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -35,6 +37,8 @@ public class RecordsMasterCheckVO {
 
     @ApiModelProperty("创建日期")
     @TableField("create_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty("更新人")
@@ -43,6 +47,8 @@ public class RecordsMasterCheckVO {
 
     @ApiModelProperty("更新时间")
     @TableField("update_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
     @ApiModelProperty("检查批次编号")
@@ -99,6 +105,8 @@ public class RecordsMasterCheckVO {
 
     @ApiModelProperty("检查日期")
     @TableField("check_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date checkTime;
 
     @ApiModelProperty("审核人姓名")
@@ -107,6 +115,8 @@ public class RecordsMasterCheckVO {
 
     @ApiModelProperty("审核时间")
     @TableField("verify_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date verifyTime;
 
     @ApiModelProperty("是否删除（0：未删除；1：已删除）")

jeecg-module-system/src/main/java/org/jeecg/modules/checkData/equipmentCheckData/vo/TrackBedManagementCheckVO.java

@@ -2,12 +2,11 @@ package org.jeecg.modules.checkData.equipmentCheckData.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 import org.jeecg.modules.utils.DicMap;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -35,6 +34,8 @@ public class TrackBedManagementCheckVO {
 
     @ApiModelProperty("创建日期")
     @TableField("create_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty("更新人")
@@ -43,6 +44,8 @@ public class TrackBedManagementCheckVO {
 
     @ApiModelProperty("更新时间")
     @TableField("update_time")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
 
     @ApiModelProperty("设备检查记录主表id->外键")