From a776be69bcd141d2c85e9cb25174c2959cb2f7aa Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期三, 11 十二月 2024 14:53:46 +0800 Subject: [PATCH] 计划非计划停机管理导入导出功能调整 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java index 4b20648..846332b 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPlanClose.java @@ -7,7 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecgframework.poi.excel.annotation.Excel; @@ -28,18 +27,23 @@ private static final long serialVersionUID = 3761395731884048515L; /** + * 鏃ユ湡 + */ + @Excel(name = "鏃ユ湡", width = 15) + @ApiModelProperty(value = "鏃ユ湡") + private String theDate; + /** + * 璁惧缂栧彿 + */ + @Excel(name = "璁惧缂栧彿", width = 15) + @ApiModelProperty(value = "璁惧缂栧彿") + private String equipmentId; + /** * 璁″垝鍋滄満绫诲瀷 */ - @Excel(name = "璁″垝鍋滄満绫诲瀷", width = 15) + @Excel(name = "鍋滄満绫诲瀷", width = 15) @ApiModelProperty(value = "璁″垝鍋滄満绫诲瀷") private String planCloseType; - /** - * 璁″垝鍋滄満鏃堕棿绫诲瀷 - */ - @Excel(name = "璁″垝鍋滄満鏃堕棿绫诲瀷", width = 15) - @ApiModelProperty(value = "璁″垝鍋滄満鏃堕棿绫诲瀷") - @Dict(dicCode = "mdc_plan_type") - private String planCloseTimeType; /** * 鏃堕暱锛堝垎閽燂級 */ @@ -47,6 +51,12 @@ @ApiModelProperty(value = "鏃堕暱锛堝垎閽燂級") private Integer planCloseTimeLong; /** + * 鍋滄満绫诲瀷(1:璁″垝,2:闈炶鍒�) + */ + @Excel(name = "鏄惁璁″垝", width = 15, replace = {"璁″垝_1", "闈炶鍒抇2"}) + @ApiModelProperty(value = "鍋滄満绫诲瀷(1:璁″垝,2:闈炶鍒�)") + private String closeType; + /** * 澶囨敞 */ @Excel(name = "澶囨敞", width = 15) -- Gitblit v1.9.3