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/EamSecondMaintenanceOrder.java |   90 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
index 762c118..b91a823 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.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;
@@ -103,9 +104,11 @@
     private Date actualEndTime;
     /** 鎿嶄綔宸� */
     @ApiModelProperty(value = "鎿嶄綔宸�")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String operator ;
     /** 缁翠慨宸� */
     @ApiModelProperty(value = "缁翠慨宸�")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String repairman ;
     /**
      * 淇濆吇鐘舵��  寰呬繚鍏汇�佷繚鍏讳腑銆佺鐞嗗憳纭銆佹鏌ヤ汉纭銆佸凡瀹屾垚
@@ -126,8 +129,14 @@
      */
     @Excel(name = "绠＄悊鍛樼‘璁�", width = 15)
     @ApiModelProperty(value = "绠＄悊鍛樼‘璁�")
-    @Dict(dicCode = "sys_user, realname, username")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String manageUser;
+    /**
+     * 绠＄悊鍛樼‘璁ょ粨鏋�
+     */
+    @ApiModelProperty(value = "绠＄悊鍛樼‘璁ょ粨鏋�")
+    @Dict(dicCode = "approve_reject")
+    private String manageUserResult;
     /** 闂鎻忚堪;榛樿 鏃� */
     @ApiModelProperty(name = "闂鎻忚堪",notes = "榛樿 鏃�")
     private String problemDescription ;
@@ -138,16 +147,25 @@
     @ApiModelProperty(name = "绠＄悊鍛樼‘璁ゆ椂闂�",notes = "")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date confirmTime ;
+    private Date confirmTime;
     /** 妫�鏌ヤ汉纭 */
     @ApiModelProperty(name = "妫�鏌ヤ汉纭",notes = "")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String inspector;
+    /**
+     * 妫�鏌ヤ汉纭缁撴灉
+     */
+    @ApiModelProperty(name = "妫�鏌ヤ汉纭缁撴灉",notes = "")
+    @Dict(dicCode = "approve_reject")
+    private String inspectorResult;
     /** 妫�鏌ヤ汉鎰忚 */
     @ApiModelProperty(name = "妫�鏌ヤ汉鎰忚",notes = "")
     private String inspectConfirmComment;
     /** 妫�鏌ヤ汉纭鏃堕棿 */
     @ApiModelProperty(name = "妫�鏌ヤ汉纭鏃堕棿",notes = "")
-    private String inspectConfirmTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date inspectConfirmTime;
     /** HF缂栫爜 */
     @ApiModelProperty(name = "HF缂栫爜",notes = "")
     private String hfCode;
@@ -166,4 +184,70 @@
     //鍨嬪彿
     @TableField(exist = false)
     private String equipmentModel;
+
+    //娴佽浆鑺傜偣浣跨敤鏌ヨ
+    @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