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/EamTechnicalStatusEvaluationApplication.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java
index 2b1a32a..cd0a0a3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.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_application瀵硅薄", description="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�")
public class EamTechnicalStatusEvaluationApplication {
-
+
/**涓婚敭*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
@@ -66,8 +67,14 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date applyDate;
+ /**鎶�鏈姸鎬侀壌瀹氭棩鏈�*/
+ @ApiModelProperty(value = "鎶�鏈姸鎬侀壌瀹氭棩鏈�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date evaluationDate;
/**鐢宠鍗曠姸鎬�;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚*/
@ApiModelProperty(value = "鐢宠鍗曠姸鎬�;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚")
+ @Dict(dicCode = "technical_status_evaluation_application_status")
private String applicationStatus;
/**鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧*/
@ApiModelProperty(value = "鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧")
@@ -80,7 +87,7 @@
private Date departHeaderSignatureTime;
/**鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧缁撴灉*/
@ApiModelProperty(value = "鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧缁撴灉")
- @Dict(dicCode = "approved_rejected")
+ @Dict(dicCode = "approve_reject")
private String departHeaderSignatureResult;
/**鐢宠鍗曚綅瀹ょ骇棰嗗鎰忚*/
@ApiModelProperty(value = "鐢宠鍗曚綅瀹ょ骇棰嗗鎰忚")
@@ -96,7 +103,7 @@
private Date productionHeaderSignatureTime;
/**鐢熶骇璁惧绠＄悊涓荤绛惧瓧缁撴灉*/
@ApiModelProperty(value = "鐢熶骇璁惧绠＄悊涓荤绛惧瓧缁撴灉")
- @Dict(dicCode = "approved_rejected")
+ @Dict(dicCode = "approve_reject")
private String productionHeaderSignatureResult;
/**鐢熶骇璁惧绠＄悊涓荤鎰忚*/
@ApiModelProperty(value = "鐢熶骇璁惧绠＄悊涓荤鎰忚")
@@ -112,7 +119,7 @@
private Date productionSupportSignatureTime;
/**鐢熶骇淇濋殰閮ㄩ瀵肩瀛楄В缁撴灉*/
@ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛楄В缁撴灉")
- @Dict(dicCode = "approved_rejected")
+ @Dict(dicCode = "approve_reject")
private String productionSupportSignatureResult;
/**鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�*/
@ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�")
@@ -130,4 +137,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 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