From 7bec214d03538b874e51ba90f09b388df243b713 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 11 七月 2025 17:42:07 +0800
Subject: [PATCH] 三保工单基础代码
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java | 195 +++++++++++++++++++++++++++++++-----------------
1 files changed, 124 insertions(+), 71 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 4a573c9..50091af 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,8 +1,6 @@
package org.jeecg.modules.eam.entity;
-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;
@@ -11,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;
@@ -28,36 +27,10 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "eam_third_maintenance_order瀵硅薄", description = "璁惧涓夌骇淇濆吇")
-public class EamThirdMaintenanceOrder implements Serializable {
+public class EamThirdMaintenanceOrder extends JeecgEntity implements Serializable {
- /**
- * 涓婚敭
- */
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- /**
- * 鍒涘缓浜�
- */
- @Excel(name = "鍒涘缓浜�", width = 15)
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**
- * 鏇存柊浜�
- */
- @Excel(name = "鏇存柊浜�", width = 15)
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**
- * 鏇存柊鏃堕棿
- */
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
+ private static final long serialVersionUID = 2805431980389464185L;
+
/**
* 鍒犻櫎鏍囪
*/
@@ -90,6 +63,20 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date maintenanceDate;
/**
+ * 閿佸畾宸ュ崟鏃ユ湡
+ */
+ @ApiModelProperty(value = "閿佸畾宸ュ崟鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date freezeOrderDate;
+ /**
+ * 宸ュ崟杩囨湡鏃ユ湡
+ */
+ @ApiModelProperty(value = "宸ュ崟杩囨湡鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date orderExpirationDate;
+ /**
* 瀹為檯寮�濮嬫椂闂�
*/
@Excel(name = "瀹為檯寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@@ -106,12 +93,12 @@
@ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
private Date actualEndTime;
/**
- * 淇濆吇浜�
+ * 缁翠慨浜�
*/
- @Excel(name = "淇濆吇浜�", width = 15)
- @ApiModelProperty(value = "淇濆吇浜�")
+ @Excel(name = "缁翠慨浜�", width = 15)
+ @ApiModelProperty(value = "缁翠慨浜�")
@Dict(dicCode = "sys_user, realname, username")
- private String operator;
+ private String repairman;
/**
* 淇濆吇鐘舵��
*/
@@ -127,71 +114,137 @@
@Dict(dicCode = "order_creation_method")
private String creationMethod;
/**
- * 鏈哄姩鍔炵‘璁�
+ * 淇濆吇浜�
*/
- @Excel(name = "鏈哄姩鍔炵‘璁�", width = 15)
- @ApiModelProperty(value = "鏈哄姩鍔炵‘璁�")
+ @Excel(name = "淇濆吇浜�", width = 15)
+ @ApiModelProperty(value = "淇濆吇浜�")
@Dict(dicCode = "sys_user, realname, username")
- private String confirmUser;
+ private String operator;
/**
- * 纭鎰忚
+ * 璁惧鍔熻兘鏄惁榻愬;鏄惁
*/
- @ApiModelProperty(value = "纭鎰忚")
- private String confirmComment;
+ @Excel(name = "璁惧鍔熻兘鏄惁榻愬;鏄惁", width = 15)
+ @ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
+ private String fullyFunctional;
/**
- * 纭鏃堕棿
+ * 璁惧鍔熻兘鏄惁榻愬;鏄惁
*/
- @Excel(name = "纭鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁惧鑳藉惁姝ｅ父杩愯浆;鏄惁", width = 15)
+ @ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
+ private String runningNormally;
+ /**
+ * 闂鎻忚堪
+ */
+ @Excel(name = "闂鎻忚堪", width = 30)
+ @ApiModelProperty(value = "闂鎻忚堪")
+ private String problemDescription;
+ /**
+ * 妫�鏌ヤ汉
+ */
+ @Excel(name = "妫�鏌ヤ汉", width = 15)
+ @ApiModelProperty(value = "妫�鏌ヤ汉")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String inspector;
+ /**
+ * 妫�鏌ユ椂闂�
+ */
+ @ApiModelProperty(value = "妫�鏌ユ椂闂�")
+ @Excel(name = "妫�鏌ユ椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "纭鏃堕棿")
- private Date confirmTime;
-
+ private Date inspectTime;
/**
- * 鍗曚綅棰嗗纭
+ * 鎿嶄綔浜虹瀛�
*/
- @Excel(name = "鍗曚綅棰嗗纭", width = 15)
- @ApiModelProperty(value = "鍗曚綅棰嗗纭")
+ @Excel(name = "鎿嶄綔浜虹瀛�", width = 15)
+ @ApiModelProperty(value = "鎿嶄綔浜虹瀛�")
@Dict(dicCode = "sys_user, realname, username")
- private String confirmLeader;
+ private String operatorSignature;
/**
- * 棰嗗鎰忚
+ * 鍗忓姪鎿嶄綔浜�
*/
- @ApiModelProperty(value = "棰嗗鎰忚")
- private String leaderConfirmComment;
+ @Excel(name = "鍗忓姪鎿嶄綔浜�", width = 15)
+ @ApiModelProperty(value = "鍗忓姪鎿嶄綔浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String assistantOperator;
/**
- * 棰嗗纭鏃堕棿
+ * 鎿嶄綔浜虹瀛楁椂闂�
*/
- @ApiModelProperty(value = "棰嗗纭鏃堕棿")
+ @ApiModelProperty(value = "鎿嶄綔浜虹瀛楁椂闂�")
+ @Excel(name = "鎿嶄綔浜虹瀛楁椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date leaderConfirmTime;
-
- @ApiModelProperty(value = "绮惧害妫�楠屼汉")
- @Dict(dicCode = "sys_user, realname, username")
- private String precisionChecker;
-
+ private Date operatorSignatureTime;
/**
- * 绮惧害妫�楠屾椂闂�
+ * 缁翠慨浜虹瀛�
*/
- @ApiModelProperty(value = "绮惧害妫�楠屾椂闂�")
+ @Excel(name = "缁翠慨浜虹瀛�", width = 15)
+ @ApiModelProperty(value = "缁翠慨浜虹瀛�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String repairmanSignature;
+ /**
+ * 鍗忓姪缁翠慨浜�
+ */
+ @Excel(name = "鍗忓姪缁翠慨浜�", width = 15)
+ @ApiModelProperty(value = "鍗忓姪缁翠慨浜�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String assistantRepairman;
+ /**
+ * 缁翠慨浜虹瀛楁椂闂�
+ */
+ @ApiModelProperty(value = "缁翠慨浜虹瀛楁椂闂�")
+ @Excel(name = "缁翠慨浜虹瀛楁椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date precisionCheckTime;
-
+ private Date repairmanSignatureTime;
/**
- * 淇濆吇涓婁紶鍥剧墖
+ * 缁翠慨瀹や富浠荤瀛�
*/
- @Excel(name = "淇濆吇涓婁紶鍥剧墖", width = 15)
- @ApiModelProperty(value = "淇濆吇涓婁紶鍥剧墖")
- private String imageFiles;
+ @Excel(name = "缁翠慨瀹や富浠荤瀛�", width = 15)
+ @ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String repairManagerSignature;
+ /**
+ * 缁翠慨瀹や富浠荤瀛楁椂闂�
+ */
+ @ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛楁椂闂�")
+ @Excel(name = "缁翠慨瀹や富浠荤瀛楁椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date repairManagerSignatureTime;
+ /**
+ * 璁惧妫�鏌ヤ汉绛惧瓧
+ */
+ @Excel(name = "璁惧妫�鏌ヤ汉绛惧瓧", width = 15)
+ @ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String inspectorSignature;
+ /**
+ * 璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿
+ */
+ @ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿")
+ @Excel(name = "璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date inspectorSignatureTime;
/**
* 澶囨敞
*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
-
+ /**
+ * 绉讳氦鍗旽F缂栫爜
+ */
+ @Excel(name = "绉讳氦鍗旽F缂栫爜", width = 15)
+ @ApiModelProperty(value = "绉讳氦鍗旽F缂栫爜")
+ private String hfCodeA;
+ /**
+ * 楠屾敹鍗旽F缂栫爜
+ */
+ @Excel(name = "楠屾敹鍗旽F缂栫爜", width = 15)
+ @ApiModelProperty(value = "楠屾敹鍗旽F缂栫爜")
+ private String hfCodeB;
//鍒楄〃灞曠ず
@TableField(exist = false)
private String equipmentCode;
--
Gitblit v1.9.3