From 0d06048c5d560e301bf17fad476975c8ffffcb56 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 05 九月 2025 16:07:31 +0800
Subject: [PATCH] 添加三级保养工作计划单生成规则
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java | 162 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 114 insertions(+), 48 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
index 635a7d9..b91a823 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.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;
@@ -78,7 +79,7 @@
*/
@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;
/**
* 璁″垝淇濆吇鏃ユ湡
@@ -101,15 +102,16 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date actualEndTime;
+ /** 鎿嶄綔宸� */
+ @ApiModelProperty(value = "鎿嶄綔宸�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String operator ;
+ /** 缁翠慨宸� */
+ @ApiModelProperty(value = "缁翠慨宸�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String repairman ;
/**
- * 淇濆吇浜�
- */
- @Excel(name = "淇濆吇浜�", width = 15)
- @ApiModelProperty(value = "淇濆吇浜�")
- @Dict(dicCode = "sys_user, realname, username")
- private String operator;
- /**
- * 淇濆吇鐘舵��
+ * 淇濆吇鐘舵�� 寰呬繚鍏汇�佷繚鍏讳腑銆佺鐞嗗憳纭銆佹鏌ヤ汉纭銆佸凡瀹屾垚
*/
@Excel(name = "淇濆吇鐘舵��", width = 15)
@ApiModelProperty(value = "淇濆吇鐘舵��")
@@ -123,55 +125,50 @@
@Dict(dicCode = "order_creation_method")
private String creationMethod;
/**
- * 缁翠慨缁勯暱纭
+ * 绠＄悊鍛樼‘璁�
*/
- @Excel(name = "缁翠慨缁勯暱纭", width = 15)
- @ApiModelProperty(value = "缁翠慨缁勯暱纭")
- @Dict(dicCode = "sys_user, realname, username")
- private String confirmUser;
+ @Excel(name = "绠＄悊鍛樼‘璁�", width = 15)
+ @ApiModelProperty(value = "绠＄悊鍛樼‘璁�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String manageUser;
/**
- * 纭鎰忚
+ * 绠＄悊鍛樼‘璁ょ粨鏋�
*/
- @ApiModelProperty(value = "纭鎰忚")
- private String confirmComment;
-
- /** 纭绫诲瀷 1 閫氳繃 2 椹冲洖 */
- @ApiModelProperty(value = "纭绫诲瀷")
- @Dict(dicCode = "approved_rejected")
- private String confirmDealType;
- /**
- * 纭鏃堕棿
- */
- @ApiModelProperty(value = "纭鏃堕棿")
+ @ApiModelProperty(value = "绠＄悊鍛樼‘璁ょ粨鏋�")
+ @Dict(dicCode = "approve_reject")
+ private String manageUserResult;
+ /** 闂鎻忚堪;榛樿 鏃� */
+ @ApiModelProperty(name = "闂鎻忚堪",notes = "榛樿 鏃�")
+ private String problemDescription ;
+ /** 澶勭悊鎻忚堪;榛樿 鏃� */
+ @ApiModelProperty(name = "澶勭悊鎻忚堪",notes = "榛樿 鏃�")
+ private String dealDescription ;
+ /** 绠＄悊鍛樼‘璁ゆ椂闂� */
+ @ApiModelProperty(name = "绠＄悊鍛樼‘璁ゆ椂闂�",notes = "")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date confirmTime;
+ /** 妫�鏌ヤ汉纭 */
+ @ApiModelProperty(name = "妫�鏌ヤ汉纭",notes = "")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String inspector;
/**
- * 鍗曚綅棰嗗纭
+ * 妫�鏌ヤ汉纭缁撴灉
*/
- @Excel(name = "鍗曚綅棰嗗纭", width = 15)
- @ApiModelProperty(value = "鍗曚綅棰嗗纭")
- @Dict(dicCode = "sys_user, realname, username")
- private String confirmLeader;
- /**
- * 棰嗗鎰忚
- */
- @ApiModelProperty(value = "棰嗗鎰忚")
- private String leaderConfirmComment;
- /**
- * 棰嗗纭鏃堕棿
- */
- @ApiModelProperty(value = "棰嗗纭鏃堕棿")
+ @ApiModelProperty(name = "妫�鏌ヤ汉纭缁撴灉",notes = "")
+ @Dict(dicCode = "approve_reject")
+ private String inspectorResult;
+ /** 妫�鏌ヤ汉鎰忚 */
+ @ApiModelProperty(name = "妫�鏌ヤ汉鎰忚",notes = "")
+ private String inspectConfirmComment;
+ /** 妫�鏌ヤ汉纭鏃堕棿 */
+ @ApiModelProperty(name = "妫�鏌ヤ汉纭鏃堕棿",notes = "")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date leaderConfirmTime;
-
- /**
- * 淇濆吇涓婁紶鍥剧墖
- */
- @Excel(name = "淇濆吇涓婁紶鍥剧墖", width = 15)
- @ApiModelProperty(value = "淇濆吇涓婁紶鍥剧墖")
- private String imageFiles;
+ private Date inspectConfirmTime;
+ /** HF缂栫爜 */
+ @ApiModelProperty(name = "HF缂栫爜",notes = "")
+ private String hfCode;
/**
* 澶囨敞
*/
@@ -184,4 +181,73 @@
private String equipmentCode;
@TableField(exist = false)
private String equipmentName;
+ //鍨嬪彿
+ @TableField(exist = false)
+ private String equipmentModel;
+
+ //娴佽浆鑺傜偣浣跨敤鏌ヨ
+ @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;
+
+ /**
+ * 鍏徃
+ */
+ @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