From a93ad6deba13025c021e59d209aec90f30ec79f9 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 16 七月 2025 15:41:16 +0800
Subject: [PATCH] 三保流程处理
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 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..2b52df0 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
@@ -53,26 +53,26 @@
*/
@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;
/**
* 閿佸畾宸ュ崟鏃ユ湡
*/
- @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 +97,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;
/**
@@ -113,13 +113,6 @@
@ApiModelProperty(value = "鍒涘缓鏂瑰紡")
@Dict(dicCode = "order_creation_method")
private String creationMethod;
- /**
- * 淇濆吇浜�
- */
- @Excel(name = "淇濆吇浜�", width = 15)
- @ApiModelProperty(value = "淇濆吇浜�")
- @Dict(dicCode = "sys_user, realname, username")
- private String operator;
/**
* 璁惧鍔熻兘鏄惁榻愬;鏄惁
*/
@@ -165,7 +158,6 @@
*/
@Excel(name = "鍗忓姪鎿嶄綔浜�", width = 15)
@ApiModelProperty(value = "鍗忓姪鎿嶄綔浜�")
- @Dict(dicCode = "sys_user, realname, username")
private String assistantOperator;
/**
* 鎿嶄綔浜虹瀛楁椂闂�
@@ -187,7 +179,6 @@
*/
@Excel(name = "鍗忓姪缁翠慨浜�", width = 15)
@ApiModelProperty(value = "鍗忓姪缁翠慨浜�")
- @Dict(dicCode = "sys_user, realname, username")
private String assistantRepairman;
/**
* 缁翠慨浜虹瀛楁椂闂�
--
Gitblit v1.9.3