From cb7eb6fa3477e624f7112a2eac632783b96bf4b4 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期一, 15 一月 2024 16:19:35 +0800 Subject: [PATCH] 点检标准 多sheet页导入 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java index 2f195aa..e4953d9 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,6 +11,7 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.List; @@ -85,7 +87,49 @@ @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤") private String status = CommonConstant.STATUS_1; + @ApiModelProperty(value = "绛惧鐘舵�侊紙1宸茬紪鍒讹紝2椹冲洖缂栧埗锛�3宸插鏍革紝4椹冲洖瀹℃牳锛�5閫氳繃锛�") + private String approvalStatus; + + @ApiModelProperty(value = "瀹℃牳/椹冲洖鎰忚") + private String auditFeedback; + + @ApiModelProperty(value = "瀹℃壒/椹冲洖鎰忚") + private String approvalFeedback; + + @ApiModelProperty(value = "缂栧埗浜�") + private String writePerson; + + @ApiModelProperty(value = "瀹℃牳浜�") + private String auditPerson; + + @ApiModelProperty(value = "瀹℃壒浜�") + private String approvalPerson; + + @ApiModelProperty(value = "瀹℃壒澶辨晥浜�") + private String loseEfficacyPerson; + + /** + * 鐢熸晥鏃堕棿 + */ + @ApiModelProperty(value = "鐢熸晥鏃堕棿") + @Excel(name = "鐢熸晥鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private java.util.Date takeEffectTime; + + /** + * 澶辨晥鏃堕棿 + */ + @ApiModelProperty(value = "澶辨晥鏃堕棿") + @Excel(name = "澶辨晥鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private java.util.Date loseEfficacyTime; + @TableField(exist = false) private List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist; + @TableField(exist = false) + private List<DailyInspectionStandard> dailyInspectionStandardlist; + } -- Gitblit v1.9.3