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 | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 104 insertions(+), 3 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 d0f9f8d..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,13 +1,18 @@ 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; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -23,7 +28,7 @@ @Accessors(chain = true) @ApiModel(value="eam_technical_status_evaluation_application瀵硅薄", description="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�") public class EamTechnicalStatusEvaluationApplication { - + /**涓婚敭*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "涓婚敭") @@ -46,46 +51,142 @@ /**鐢宠鍗曞彿*/ @ApiModelProperty(value = "鐢宠鍗曞彿") private String applicationOrderNum; + /**璁惧ID*/ + @ApiModelProperty(value = "璁惧ID") + private String equipmentId; /**鐢宠浜�*/ @ApiModelProperty(value = "鐢宠浜�") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") private String applicant; /**鐢宠閮ㄩ棬*/ @ApiModelProperty(value = "鐢宠閮ㄩ棬") + @Dict(dictTable = "eam_base_factory", dicText = "factory_name", dicCode = "org_code") private String factoryOrgCode; /**鐢宠鏃ユ湡*/ @ApiModelProperty(value = "鐢宠鏃ユ湡") + @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 = "鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") private String departHeaderSignature; /**鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧鏃堕棿*/ @ApiModelProperty(value = "鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧鏃堕棿") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date departHeaderSignatureTime; + /**鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧缁撴灉*/ + @ApiModelProperty(value = "鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧缁撴灉") + @Dict(dicCode = "approve_reject") + private String departHeaderSignatureResult; /**鐢宠鍗曚綅瀹ょ骇棰嗗鎰忚*/ @ApiModelProperty(value = "鐢宠鍗曚綅瀹ょ骇棰嗗鎰忚") private String departHeaderComment; /**鐢熶骇璁惧绠$悊涓荤绛惧瓧*/ @ApiModelProperty(value = "鐢熶骇璁惧绠$悊涓荤绛惧瓧") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") private String productionHeaderSignature; - /**鐢熶骇璁惧绠$悊涓荤绛惧瓧鍥涗欢*/ - @ApiModelProperty(value = "鐢熶骇璁惧绠$悊涓荤绛惧瓧鍥涗欢") + /**鐢熶骇璁惧绠$悊涓荤绛惧瓧鏃堕棿*/ + @ApiModelProperty(value = "鐢熶骇璁惧绠$悊涓荤绛惧瓧鏃堕棿") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date productionHeaderSignatureTime; + /**鐢熶骇璁惧绠$悊涓荤绛惧瓧缁撴灉*/ + @ApiModelProperty(value = "鐢熶骇璁惧绠$悊涓荤绛惧瓧缁撴灉") + @Dict(dicCode = "approve_reject") + private String productionHeaderSignatureResult; /**鐢熶骇璁惧绠$悊涓荤鎰忚*/ @ApiModelProperty(value = "鐢熶骇璁惧绠$悊涓荤鎰忚") private String productionHeaderComment; /**鐢熶骇淇濋殰閮ㄩ瀵肩瀛�*/ @ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛�") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") private String productionSupportSignature; /**鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�*/ @ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date productionSupportSignatureTime; + /**鐢熶骇淇濋殰閮ㄩ瀵肩瀛楄В缁撴灉*/ + @ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛楄В缁撴灉") + @Dict(dicCode = "approve_reject") + private String productionSupportSignatureResult; /**鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�*/ @ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�") private String productionSupportComment; /**HF缂栫爜*/ @ApiModelProperty(value = "HF缂栫爜") private String hfCode; + /**澶囨敞*/ + @ApiModelProperty(value = "澶囨敞") + private String remark; + + @TableField(exist = false) + private String equipmentCode; + @TableField(exist = false) + 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