From 00311f718b9ed42d48305b8ffe98ef79fdb3e716 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 04 九月 2025 15:15:29 +0800
Subject: [PATCH] 设备管理技术状态鉴定、设备保养、设备维修下所有列表添加使用部门展示
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
index 0310f65..4abb4f9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.entity;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -11,6 +12,7 @@
import lombok.EqualsAndHashCode;
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.util.Date;
@@ -27,7 +29,7 @@
@Accessors(chain = true)
@ApiModel(value="eam_technical_status_evaluation_order瀵硅薄", description="鎶�鏈姸鎬侀壌瀹氬伐鍗�")
public class EamTechnicalStatusEvaluationOrder {
-
+
/**涓婚敭*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
@@ -81,8 +83,9 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
private Date actualEndTime;
- /**閴村畾浜�*/
- @ApiModelProperty(value = "閴村畾浜�")
+ /**棰嗗彇浜�*/
+ @ApiModelProperty(value = "棰嗗彇浜�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String evaluator;
/**閴村畾鐘舵��;寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佷娇鐢ㄥ崟浣嶆妧鏈富绠＄瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡*/
@ApiModelProperty(value = "閴村畾鐘舵��;寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佷娇鐢ㄥ崟浣嶆妧鏈富绠＄瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡")
@@ -103,7 +106,7 @@
private String otherCheckCompleted;
/**瀹夊叏瑁呯疆妫�鏌ョ‘璁や汉*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁や汉")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String safetyCheckConfirm;
/**瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ椂闂�*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ椂闂�")
@@ -119,7 +122,7 @@
private String safetyCheckConfirmComment;
/**璁惧绮惧害妫�鏌ョ‘璁や汉*/
@ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁や汉")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String precisionCheckConfirm;
/**璁惧绮惧害妫�鏌ョ‘璁ゆ椂闂�*/
@ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁ゆ椂闂�")
@@ -135,7 +138,7 @@
private String precisionCheckConfirmComment;
/**鍏朵粬妫�鏌ョ‘璁や汉*/
@ApiModelProperty(value = "鍏朵粬妫�鏌ョ‘璁や汉")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String otherCheckConfirm;
/**鍏朵粬妫�鏌ョ‘璁ゆ椂闂�*/
@ApiModelProperty(value = "鍏朵粬妫�鏌ョ‘璁ゆ椂闂�")
@@ -155,7 +158,7 @@
private String safetyEquipmentCheckResult;
/**绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
@ApiModelProperty(value = "绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
- @Dict(dicCode = "ye_no_none")
+ @Dict(dicCode = "yes_no_none")
private String precisionCheckResult;
/**鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁*/
@ApiModelProperty(value = "鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁")
@@ -163,11 +166,11 @@
private String functionalCheckResult;
/**鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/
@ApiModelProperty(value = "鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤")
- @Dict(dicCode = "ye_no_none")
+ @Dict(dicCode = "yes_no_none")
private String otherCheckResult;
/**缁翠慨浜虹瀛�*/
@ApiModelProperty(value = "缁翠慨浜虹瀛�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairerSignature;
/**缁翠慨浜虹瀛楁椂闂�*/
@ApiModelProperty(value = "缁翠慨浜虹瀛楁椂闂�")
@@ -176,7 +179,7 @@
private Date repairerSignatureTime;
/**缁翠慨瀹や富浠荤瀛�*/
@ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairManagerSignature;
/**缁翠慨瀹や富浠荤瀛楁椂闂�*/
@ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛楁椂闂�")
@@ -195,7 +198,7 @@
private String sampleCheckResult;
/**宸ヨ壓鍛樼瀛�*/
@ApiModelProperty(value = "宸ヨ壓鍛樼瀛�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String processTechnicianSignature;
/**宸ヨ壓鍛樼瀛楁椂闂�*/
@ApiModelProperty(value = "宸ヨ壓鍛樼瀛楁椂闂�")
@@ -207,7 +210,7 @@
private String processTechnicianComment;
/**浣跨敤鍗曚綅鎶�鏈富绠＄瀛�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String departTechnicalLeaderSignature;
/**浣跨敤鍗曚綅鎶�鏈富绠＄瀛楁椂闂�*/
@ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛楁椂闂�")
@@ -231,7 +234,7 @@
private String evaluationReason;
/**璁惧妫�鏌ヤ汉绛惧瓧*/
@ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String inspectorSignature;
/**璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿*/
@ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿")
@@ -264,4 +267,56 @@
private String equipmentName;
@TableField(exist = false)
private String equipmentModel;
+
+ /**
+ * 鍏徃
+ */
+ @ApiModelProperty(value = "鍏徃")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @TableField(exist = false)
+ private transient String gsfactoryOrgCode;
+
+ /**
+ * 涓績
+ */
+ @ApiModelProperty(value = "涓績")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @TableField(exist = false)
+ private transient String zxfactoryOrgCode;
+
+ /**
+ * 宸ュ尯
+ */
+ @ApiModelProperty(value = "宸ュ尯")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @TableField(exist = false)
+ private transient String gqfactoryOrgCode;
+
+ /**
+ * 宸ユ
+ */
+ @ApiModelProperty(value = "涓績/宸ュ尯/宸ユ")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @TableField(exist = false)
+ private String factoryOrgCode;
+
+ public void setFactoryOrgCode(String factoryOrgCode){
+ this.factoryOrgCode = factoryOrgCode;
+ if(StrUtil.isNotEmpty(factoryOrgCode)){
+ if(factoryOrgCode.length()==12){
+ this.gqfactoryOrgCode = factoryOrgCode.substring(0,9);
+ this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+ this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+ }
+
+ if(factoryOrgCode.length()==9){
+ this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+ this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+ }
+
+ if(factoryOrgCode.length()==6){
+ this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+ }
+ }
+ }
}
--
Gitblit v1.9.3