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/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java |   64 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java
index 7b416fd..80f27a2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.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;
@@ -27,7 +28,7 @@
 @Accessors(chain = true)
 @ApiModel(value="eam_technical_status_evaluation_order_change瀵硅薄", description="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�")
 public class EamTechnicalStatusEvaluationOrderChange {
-    
+
 	/**涓婚敭*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "涓婚敭")
@@ -93,7 +94,7 @@
 	private Date equipmentManagerSignatureTime;
 	/**涓荤棰嗗绛惧瓧缁撴灉*/
 	@ApiModelProperty(value = "涓荤棰嗗绛惧瓧缁撴灉")
-	@Dict(dicCode = "approved_rejected")
+	@Dict(dicCode = "approve_reject")
 	private String equipmentManagerSignatureResult;
 	/**涓荤棰嗗鎰忚*/
 	@ApiModelProperty(value = "涓荤棰嗗鎰忚")
@@ -109,7 +110,7 @@
 	private Date departManagerSignatureTime;
 	/**閮ㄩ棬棰嗗绛惧瓧缁撴灉*/
 	@ApiModelProperty(value = "閮ㄩ棬棰嗗绛惧瓧缁撴灉")
-	@Dict(dicCode = "approved_rejected")
+	@Dict(dicCode = "approve_reject")
 	private String departManagerSignatureResult;
 	/**閮ㄩ棬棰嗗鎰忚*/
     @ApiModelProperty(value = "閮ㄩ棬棰嗗鎰忚")
@@ -125,7 +126,7 @@
 	private Date productionSupportSignatureTime;
 	/**鐢熶骇淇濋殰閮ㄩ瀵肩瀛楃粨鏋�*/
 	@ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛楃粨鏋�")
-	@Dict(dicCode = "approved_rejected")
+	@Dict(dicCode = "approve_reject")
 	private String productionSupportSignatureResult;
 	/**鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�*/
     @ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�")
@@ -133,6 +134,9 @@
 	/**HF缂栫爜*/
     @ApiModelProperty(value = "HF缂栫爜")
 	private String hfCode;
+	/**澶囨敞*/
+	@ApiModelProperty(value = "澶囨敞")
+	private String remark;
 
 	@TableField(exist = false)
 	private String equipmentCode;
@@ -142,4 +146,56 @@
 	private String equipmentModel;
 	@TableField(exist = false)
 	private Date originalEvaluationDate;
+
+	/**
+	 * 鍏徃
+	 */
+	@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 factoryCode;
+
+	public void setFactoryCode(String factoryCode){
+		this.factoryCode = factoryCode;
+		if(StrUtil.isNotEmpty(factoryCode)){
+			if(factoryCode.length()==12){
+				this.factoryCode = factoryCode.substring(0,9);
+				this.zxfactoryOrgCode = factoryCode.substring(0,6);
+				this.gsfactoryOrgCode = factoryCode.substring(0,3);
+			}
+
+			if(factoryCode.length()==9){
+				this.zxfactoryOrgCode = factoryCode.substring(0,6);
+				this.gsfactoryOrgCode = factoryCode.substring(0,3);
+			}
+
+			if(factoryCode.length()==6){
+				this.gsfactoryOrgCode = factoryCode.substring(0,3);
+			}
+		}
+	}
 }

--
Gitblit v1.9.3