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/CalibrationOrder.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java index 2636073..e3b5ec8 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/CalibrationOrder.java @@ -68,18 +68,19 @@ */ @Excel(name = "妫�瀹氭椂闂�", width = 15) @ApiModelProperty(value = "妫�瀹氭椂闂�") - private Date calibrationTime; + private java.util.Date calibrationTime; /** * 涓嬪彂鏃堕棿 */ @Excel(name = "涓嬪彂鏃堕棿", width = 15) @ApiModelProperty(value = "涓嬪彂鏃堕棿") - private Date issueTime; + private java.util.Date issueTime; /** * 妫�瀹氱粨鏋� */ @Excel(name = "妫�瀹氱粨鏋�", width = 15) @ApiModelProperty(value = "妫�瀹氱粨鏋�") + @Dict(dicCode = "technology_status") private String calibrationResult; /** * 妫�瀹氱粨鏋滄弿杩� @@ -152,6 +153,7 @@ */ @Excel(name = "澶囩敤瀛楁6", width = 15) @ApiModelProperty(value = "澶囩敤瀛楁6") + @Dict(dicCode = "technology_status") private String calibrationOrderUda6; /** * 浼佷笟ID @@ -185,6 +187,14 @@ @TableField(exist = false) private String equipmentSpecification; + + @TableField(exist = false) + private String useDepartName; + /** + * ABC鏍囪瘑 + */ + @TableField(exist = false) + private String equipmentImportance; @TableField(exist = false) private List<Map<String, Object>> precisionParameterList; @@ -246,4 +256,8 @@ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date issueEndDate; + + @TableField(exist = false) + private String statusEnums; + } -- Gitblit v1.9.3