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/EamInspectionOrder.java | 118 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 35 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
index 863aa72..699f82e 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.entity;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -8,6 +9,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -25,35 +27,9 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="eam_inspection_order瀵硅薄", description="鐐规宸ュ崟")
-public class EamInspectionOrder implements Serializable {
+public class EamInspectionOrder extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L;
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- @TableLogic
- private Integer delFlag;
/**宸ュ崟鍙�*/
@Excel(name = "宸ュ崟鍙�", width = 15)
@ApiModelProperty(value = "宸ュ崟鍙�")
@@ -122,22 +98,94 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞-鐐规宸ュ崟鍒涘缓澶囨敞")
private String remark;
- /**鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧*/
- @Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧-鎵ц鏃�", width = 15)
- @ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
- private String imageFiles;
/**鏍囧噯鍚嶇О*/
@ApiModelProperty(value = "鏍囧噯鍚嶇О")
private transient String standardName;
- /**淇濆吇鍛ㄦ湡;鍗曚綅:澶�*/
- @ApiModelProperty(value = "淇濆吇鍛ㄦ湡;鍗曚綅:澶�")
- private transient Integer maintenancePeriod;
- /**璁惧缂栧彿*/
@ApiModelProperty(value = "璁惧缂栧彿")
private transient String equipmentCode;
+
+ /**鍒犻櫎鏍囪*/
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag;
@ApiModelProperty(value = "璁惧鍚嶇О")
@TableField(exist = false)
private String equipmentName;
+
+ @ApiModelProperty(value = "璁惧鍨嬪彿")
+ @TableField(exist = false)
+ private String equipmentModel;
+
+ /**HF缂栫爜*/
+ @Excel(name = "HF缂栫爜", width = 15)
+ @ApiModelProperty(value = "HF缂栫爜")
+ private String hfCode;
+
+ //娴佽浆鑺傜偣浣跨敤鏌ヨ
+ @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