From 0063343edb7cee0a8b460f4b1424748e660ec370 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 31 七月 2025 16:23:03 +0800
Subject: [PATCH] 修改保养规范点检导入

---
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
index 4d1e8db..dae7639 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
@@ -1,6 +1,6 @@
 package org.jeecg.modules.eam.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -62,7 +62,8 @@
     @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date maintenanceDate;
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String maintenanceDate;
     /**
      * 閿佸畾宸ュ崟鏃ユ湡
      */
@@ -98,7 +99,7 @@
      */
     @Excel(name = "缁翠慨浜�", width = 15)
     @ApiModelProperty(value = "缁翠慨浜�")
-    @Dict(dicCode = "sys_user, realname, username")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String repairman;
     /**
      * 淇濆吇鐘舵��
@@ -119,12 +120,14 @@
      */
     @Excel(name = "璁惧鍔熻兘鏄惁榻愬;鏄惁", width = 15)
     @ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
+    @Dict(dicCode = "yn")
     private String fullyFunctional;
     /**
      * 璁惧鍔熻兘鏄惁榻愬;鏄惁
      */
     @Excel(name = "璁惧鑳藉惁姝ｅ父杩愯浆;鏄惁", width = 15)
     @ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
+    @Dict(dicCode = "yn")
     private String runningNormally;
     /**
      * 闂鎻忚堪
@@ -137,7 +140,7 @@
      */
     @Excel(name = "妫�鏌ヤ汉", width = 15)
     @ApiModelProperty(value = "妫�鏌ヤ汉")
-    @Dict(dicCode = "sys_user, realname, username")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String inspector;
     /**
      * 妫�鏌ユ椂闂�
@@ -152,14 +155,13 @@
      */
     @Excel(name = "鎿嶄綔浜虹瀛�", width = 15)
     @ApiModelProperty(value = "鎿嶄綔浜虹瀛�")
-    @Dict(dicCode = "sys_user, realname, username")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String operatorSignature;
     /**
      * 鍗忓姪鎿嶄綔浜�
      */
     @Excel(name = "鍗忓姪鎿嶄綔浜�", width = 15)
     @ApiModelProperty(value = "鍗忓姪鎿嶄綔浜�")
-    @Dict(dicCode = "sys_user, realname, username")
     private String assistantOperator;
     /**
      * 鎿嶄綔浜虹瀛楁椂闂�
@@ -174,14 +176,13 @@
      */
     @Excel(name = "缁翠慨浜虹瀛�", width = 15)
     @ApiModelProperty(value = "缁翠慨浜虹瀛�")
-    @Dict(dicCode = "sys_user, realname, username")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String repairmanSignature;
     /**
      * 鍗忓姪缁翠慨浜�
      */
     @Excel(name = "鍗忓姪缁翠慨浜�", width = 15)
     @ApiModelProperty(value = "鍗忓姪缁翠慨浜�")
-    @Dict(dicCode = "sys_user, realname, username")
     private String assistantRepairman;
     /**
      * 缁翠慨浜虹瀛楁椂闂�
@@ -196,7 +197,7 @@
      */
     @Excel(name = "缁翠慨瀹や富浠荤瀛�", width = 15)
     @ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛�")
-    @Dict(dicCode = "sys_user, realname, username")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String repairManagerSignature;
     /**
      * 缁翠慨瀹や富浠荤瀛楁椂闂�
@@ -211,7 +212,7 @@
      */
     @Excel(name = "璁惧妫�鏌ヤ汉绛惧瓧", width = 15)
     @ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧")
-    @Dict(dicCode = "sys_user, realname, username")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
     private String inspectorSignature;
     /**
      * 璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿
@@ -244,4 +245,6 @@
     private String equipmentCode;
     @TableField(exist = false)
     private String equipmentName;
+    @TableField(exist = false)
+    private String equipmentModel;
 }

--
Gitblit v1.9.3