From ed48aa9f30a87c528f071d06bf6b59d7d15428e9 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期一, 26 五月 2025 16:12:55 +0800 Subject: [PATCH] 点检报表后端 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java index 6cdce5b..1a5af69 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java @@ -1,9 +1,11 @@ package org.jeecg.modules.eam.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @@ -26,19 +28,25 @@ @Excel(name = "鍨嬪彿") private String model; -// @Excel(name = "浣跨敤閮ㄩ棬",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name") + @Excel(name = "浣跨敤閮ㄩ棬") private String useId; -// @Excel(name = "宸ュ尯",dicCode = "id",dictTable = "mom_base_area",dicText = "name") + @Excel(name = "涓績") + private String workCenterId; + + @Excel(name = "宸ュ尯") private String factoryModelId; -// @Excel(name = "缁存姢閮ㄩ棬",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name") + @Excel(name = "宸ユ") + private String areaId; + + @Excel(name = "缁存姢閮ㄩ棬") private String manageId; -// @Excel(name = "缁翠慨鐝粍",dictTable = "mom_base_team",dicCode = "id"2,dicText = "name") + @Excel(name = "缁翠慨鐝粍") private String teamId; -// @Excel(name = "璧勪骇鍒堕�犲晢",dicCode = "id",dictTable="mom_base_constructor",dicText="name") + @Excel(name = "璧勪骇鍒堕�犲晢") private String constructorId; @Excel(name = "ABC鏍囪瘑",dicCode = "ABC-standard-result") @@ -122,5 +130,10 @@ @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyyMMdd") private Date nextTechnologyStatusQualificationTime; + @Excel(name = "涓変繚鏃ユ湡", format = "yyyy-MM-dd") + private java.util.Date thirdMaintenanceTime; + + @Excel(name = "鎶�鏈姸鎬侀壌瀹氭棩鏈�", format = "yyyy-MM-dd") + private java.util.Date technologyStatusQualificationTime; } -- Gitblit v1.9.3