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/EamThirdMaintenanceChange.java |   89 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 88 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceChange.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceChange.java
index 6636e22..79f98c8 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceChange.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceChange.java
@@ -1,5 +1,8 @@
 package org.jeecg.modules.eam.entity;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -8,6 +11,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.apache.ibatis.type.JdbcType;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.common.system.base.entity.JeecgEntity;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -37,6 +41,18 @@
     @Excel(name = "鍒犻櫎鏍囪", width = 15)
     @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private Integer delFlag;
+    /**
+     * 澶囨敞
+     */
+    @Excel(name = "澶囨敞", width = 15)
+    @ApiModelProperty(value = "澶囨敞")
+    private String remark;
+    /**
+     * 璁惧ID
+     */
+    @Excel(name = "璁惧ID", width = 15)
+    @ApiModelProperty(value = "璁惧ID")
+    private String equipmentId;
     /**
      * 涓変繚宸ュ崟ID
      */
@@ -106,7 +122,8 @@
     @Excel(name = "寤惰繜淇濆吇鏃ユ湡", width = 20, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date deferredMaintenanceDate;
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String deferredMaintenanceDate;
     /**
      * 涓荤棰嗗绛惧瓧
      */
@@ -122,6 +139,16 @@
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date equipmentManagerSignatureTime;
+    /**涓荤棰嗗绛惧瓧缁撴灉*/
+    @ApiModelProperty(value = "涓荤棰嗗绛惧瓧缁撴灉")
+    @Dict(dicCode = "approve_reject")
+    private String equipmentManagerSignatureResult;
+    /**
+     * 閮ㄩ棬棰嗗鎰忚
+     */
+    @Excel(name = "涓荤棰嗗鎰忚", width = 15)
+    @ApiModelProperty(value = "涓荤棰嗗鎰忚")
+    private String equipmentManagerComment;
     /**
      * 閮ㄩ棬棰嗗绛惧瓧;鏍规嵁寤朵繚鍘熷洜绫诲瀷鍖哄垎涓嶅悓鐨勪汉瀹℃壒
      */
@@ -137,6 +164,10 @@
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date departManagerSignatureTime;
+    /**閮ㄩ棬棰嗗绛惧瓧缁撴灉*/
+    @ApiModelProperty(value = "閮ㄩ棬棰嗗绛惧瓧缁撴灉")
+    @Dict(dicCode = "approve_reject")
+    private String departManagerSignatureResult;
     /**
      * 閮ㄩ棬棰嗗鎰忚
      */
@@ -158,6 +189,10 @@
     @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;
     /**
      * 鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�
      */
@@ -178,4 +213,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