From fccfe7d50f42f5be4c4612d61b7ae852e2ef37cd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 17 四月 2025 15:26:09 +0800
Subject: [PATCH] 优化指派设备与审签设备的权限校验查询，新增导入电子样板触发审签流程，新增电子样板指派设备功能
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
index d0752ca..6c4d814 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
@@ -1,6 +1,7 @@
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;
@@ -53,7 +54,7 @@
private String orderNum;
/**璁惧ID*/
@ApiModelProperty(value = "璁惧ID")
- @Dict(dicCode = "eam_equipment, equipment_code, id")
+// @Dict(dicCode = "eam_equipment, equipment_code, id")
private String equipmentId;
/**鏍囧噯ID*/
@ApiModelProperty(value = "鏍囧噯ID")
@@ -80,7 +81,7 @@
private String operator;
/**淇濆吇鐘舵��*/
@ApiModelProperty(value = "淇濆吇鐘舵��")
- @Dict(dicCode = "maintenance_status")
+ @Dict(dicCode = "week_maintenance_status")
private String maintenanceStatus;
/**鍒涘缓鏂瑰紡*/
@ApiModelProperty(value = "鍒涘缓鏂瑰紡")
@@ -101,4 +102,42 @@
/**澶囨敞*/
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ /**纭鎰忚*/
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /**鍒濋獙鏀朵汉*/
+ @ApiModelProperty(value = "鍒濋獙鏀朵汉")
+ private String initialAcceptanceUser;
+ /**鍒濋獙鏀舵椂闂�*/
+ @ApiModelProperty(value = "鍒濋獙鏀舵椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date initialAcceptanceTime;
+ /**鍒濋獙鏀舵剰瑙�*/
+ @ApiModelProperty(value = "鍒濋獙鏀舵剰瑙�")
+ private String initialAcceptanceComment;
+ /**鍒濋獙鏀堕檮浠�*/
+ @ApiModelProperty(value = "鍒濋獙鏀堕檮浠�")
+ private String initialAcceptanceFiles;
+ /**缁堥獙鏀朵汉*/
+ @ApiModelProperty(value = "缁堥獙鏀朵汉")
+ private String finalAcceptanceUser;
+ /**缁堥獙鏀舵椂闂�*/
+ @ApiModelProperty(value = "缁堥獙鏀舵椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date finalAcceptanceTime;
+ /**缁堥獙鏀舵剰瑙�*/
+ @ApiModelProperty(value = "缁堥獙鏀舵剰瑙�")
+ private String finalAcceptanceComment;
+ /**缁堥獙鏀堕檮浠�*/
+ @ApiModelProperty(value = "缁堥獙鏀堕檮浠�")
+ private String finalAcceptanceFiles;
+
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
}
--
Gitblit v1.9.3