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/EamMaintenanceStandard.java | 138 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 126 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
index 5dabd18..0d1fd3a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.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.io.Serializable;
@@ -76,6 +78,12 @@
@ApiModelProperty(value = "淇濆吇鍛ㄦ湡;鍗曚綅:澶�")
private Integer maintenancePeriod;
/**
+ * 淇濆吇鍛ㄦ湡鍗曚綅
+ */
+ @ApiModelProperty(value = "淇濆吇鍛ㄦ湡鍗曚綅")
+ @Dict(dicCode = "period_unit")
+ private String periodUnit;
+ /**
* 鍒濆鏃ユ湡 浠庡摢涓�澶╁紑濮嬭绠椾笅娆′繚鍏绘棩鏈�
*/
@ApiModelProperty(value = "鍒濆鏃ユ湡")
@@ -104,24 +112,63 @@
* 鏍囧噯鐗堟湰
*/
@ApiModelProperty(value = "鏍囧噯鐗堟湰")
- private Integer standardVersion;
+ private String standardVersion;
/**
- * 鏂囦欢缂栧彿
+ * 缂栧埗浜�
*/
- @ApiModelProperty(value = "鏂囦欢缂栧彿")
- private String fileCode;
+ @ApiModelProperty(value = "缂栧埗浜�")
+ private String designer;
/**
- * 鍙傝�冩枃浠�
+ * 缂栧埗鏃ユ湡
*/
- @ApiModelProperty(value = "鍙傝�冩枃浠�")
- private String referenceFile;
+ @ApiModelProperty(value = "缂栧埗鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date designTime;
/**
- * 鏈�鏂扮敓鎴愬伐鍗曟椂闂�
- * 涓嬩竴娆＄敓鎴愭椂闂翠负姝ゆ椂闂� + 淇濆吇鍛ㄦ湡
+ * 缁翠慨涓讳换
*/
- @ApiModelProperty(value = "鏈�鏂扮敓鎴愬伐鍗曟椂闂�")
- private Date lastGenerateTime;
-
+ @ApiModelProperty(value = "缁翠慨涓讳换")
+ private String repairManager;
+ /**
+ * 缁翠慨涓讳换瀹℃壒缁撴灉
+ */
+ @ApiModelProperty(value = "缁翠慨涓讳换瀹℃壒缁撴灉")
+ private String repairManagerApproveResult;
+ /**
+ * 缁翠慨涓讳换瀹℃壒鏃堕棿
+ */
+ @ApiModelProperty(value = "缁翠慨涓讳换瀹℃壒鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date repairManagerApproveTime;
+ /**
+ * 缁翠慨涓讳换瀹℃壒鎰忚
+ */
+ @ApiModelProperty(value = "缁翠慨涓讳换瀹℃壒鎰忚")
+ private String repairManagerApproveComment;
+ /**
+ * 鎶�鏈富绠�
+ */
+ @ApiModelProperty(value = "鎶�鏈富绠�")
+ private String technicalManager;
+ /**
+ * 鎶�鏈富绠″鎵圭粨鏋�
+ */
+ @ApiModelProperty(value = "鎶�鏈富绠″鎵圭粨鏋�")
+ private String technicalManagerApproveResult;
+ /**
+ * 鎶�鏈富绠″鎵规椂闂�
+ */
+ @ApiModelProperty(value = "鎶�鏈富绠″鎵规椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date technicalManagerApproveTime;
+ /**
+ * 鎶�鏈富绠″鎵规剰瑙�
+ */
+ @ApiModelProperty(value = "鎶�鏈富绠″鎵规剰瑙�")
+ private String technicalManagerApproveComment;
//鍒楄〃灞曠ず
@TableField(exist = false)
private String equipmentCode;
@@ -129,13 +176,80 @@
private String equipmentName;
@TableField(exist = false)
private String keyword;
+ @TableField(exist = false)
+ private String equipmentModel;
/**
* 璁惧缂栧彿鎷兼帴
*/
@TableField(exist = false)
private String equipmentText;
+ //娴佽浆鑺傜偣浣跨敤鏌ヨ
+ @TableField(exist = false)
+ private String procInstId;
+ /**娴佺▼瀹氫箟key 涓�涓猭ey浼氭湁澶氫釜鐗堟湰鐨刬d*/
+ @TableField(exist = false)
+ private String processDefinitionKey;
+ /**娴佺▼瀹氫箟id 涓�涓祦绋嬪畾涔夊敮涓�*/
+ @TableField(exist = false)
+ private String processDefinitionId;
+ /**娴佺▼涓氬姟瀹炰緥id 涓�涓祦绋嬩笟鍔″敮涓�锛屾湰琛ㄤ腑涔熷敮涓�*/
+ @TableField(exist = false)
+ private String processInstanceId;
+
public String getEquipmentText() {
return equipmentCode + "[" + equipmentName + "]";
}
+
+ /**
+ * 鍏徃
+ */
+ @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