From 0bc74278ff8130936bc7aed763e8901fedb4f3b0 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 01 八月 2025 11:44:49 +0800
Subject: [PATCH] 故障报修新增hf编码
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
index 50091af..dae7639 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.entity;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -53,26 +54,27 @@
*/
@Excel(name = "鏍囧噯ID", width = 15)
@ApiModelProperty(value = "鏍囧噯ID")
- @Dict(dicCode = "eam_maintenance_standard, standard_name, id")
+ @Dict(dictTable = "eam_maintenance_standard", dicCode = "id", dicText = "standard_name")
private String standardId;
/**
* 璁″垝淇濆吇鏃ユ湡
*/
- @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡")
+ @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date maintenanceDate;
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private String maintenanceDate;
/**
* 閿佸畾宸ュ崟鏃ユ湡
*/
- @ApiModelProperty(value = "閿佸畾宸ュ崟鏃ユ湡")
+ @ApiModelProperty(value = "閿佸畾宸ュ崟鏃ユ湡;鎻愬墠55澶╅攣瀹氬伐鍗�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date freezeOrderDate;
/**
* 宸ュ崟杩囨湡鏃ユ湡
*/
- @ApiModelProperty(value = "宸ュ崟杩囨湡鏃ユ湡")
+ @ApiModelProperty(value = "宸ュ崟杩囨湡鏃ユ湡;鍒版湡鏈仛鐩存帴杩囨湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date orderExpirationDate;
@@ -97,13 +99,13 @@
*/
@Excel(name = "缁翠慨浜�", width = 15)
@ApiModelProperty(value = "缁翠慨浜�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairman;
/**
* 淇濆吇鐘舵��
*/
@Excel(name = "淇濆吇鐘舵��", width = 15)
- @ApiModelProperty(value = "淇濆吇鐘舵��")
+ @ApiModelProperty(value = "淇濆吇鐘舵��;寰呬繚鍏汇�佷繚鍏讳腑銆佸緟妫�鏌ャ�佹搷浣滀汉绛惧瓧銆佺淮淇汉绛惧瓧銆佺淮淇涓讳换绛惧瓧銆佽澶囨鏌ヤ汉绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡鍙栨秷")
@Dict(dicCode = "third_maintenance_status")
private String maintenanceStatus;
/**
@@ -114,23 +116,18 @@
@Dict(dicCode = "order_creation_method")
private String creationMethod;
/**
- * 淇濆吇浜�
- */
- @Excel(name = "淇濆吇浜�", width = 15)
- @ApiModelProperty(value = "淇濆吇浜�")
- @Dict(dicCode = "sys_user, realname, username")
- private String operator;
- /**
* 璁惧鍔熻兘鏄惁榻愬;鏄惁
*/
@Excel(name = "璁惧鍔熻兘鏄惁榻愬;鏄惁", width = 15)
@ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
+ @Dict(dicCode = "yn")
private String fullyFunctional;
/**
* 璁惧鍔熻兘鏄惁榻愬;鏄惁
*/
@Excel(name = "璁惧鑳藉惁姝ｅ父杩愯浆;鏄惁", width = 15)
@ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
+ @Dict(dicCode = "yn")
private String runningNormally;
/**
* 闂鎻忚堪
@@ -143,7 +140,7 @@
*/
@Excel(name = "妫�鏌ヤ汉", width = 15)
@ApiModelProperty(value = "妫�鏌ヤ汉")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String inspector;
/**
* 妫�鏌ユ椂闂�
@@ -158,14 +155,13 @@
*/
@Excel(name = "鎿嶄綔浜虹瀛�", width = 15)
@ApiModelProperty(value = "鎿嶄綔浜虹瀛�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String operatorSignature;
/**
* 鍗忓姪鎿嶄綔浜�
*/
@Excel(name = "鍗忓姪鎿嶄綔浜�", width = 15)
@ApiModelProperty(value = "鍗忓姪鎿嶄綔浜�")
- @Dict(dicCode = "sys_user, realname, username")
private String assistantOperator;
/**
* 鎿嶄綔浜虹瀛楁椂闂�
@@ -180,14 +176,13 @@
*/
@Excel(name = "缁翠慨浜虹瀛�", width = 15)
@ApiModelProperty(value = "缁翠慨浜虹瀛�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairmanSignature;
/**
* 鍗忓姪缁翠慨浜�
*/
@Excel(name = "鍗忓姪缁翠慨浜�", width = 15)
@ApiModelProperty(value = "鍗忓姪缁翠慨浜�")
- @Dict(dicCode = "sys_user, realname, username")
private String assistantRepairman;
/**
* 缁翠慨浜虹瀛楁椂闂�
@@ -202,7 +197,7 @@
*/
@Excel(name = "缁翠慨瀹や富浠荤瀛�", width = 15)
@ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairManagerSignature;
/**
* 缁翠慨瀹や富浠荤瀛楁椂闂�
@@ -217,7 +212,7 @@
*/
@Excel(name = "璁惧妫�鏌ヤ汉绛惧瓧", width = 15)
@ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String inspectorSignature;
/**
* 璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿
@@ -250,4 +245,6 @@
private String equipmentCode;
@TableField(exist = false)
private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
}
--
Gitblit v1.9.3