From faf06098c4bf5c351cc190f97a743ddcf2d3fd0c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 四月 2025 09:36:00 +0800
Subject: [PATCH] art: 设备管理-点检工单-点检增加确认类型，确认意见字段
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java
index 691f2b2..fcaa20b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java
@@ -26,7 +26,6 @@
private static final long serialVersionUID = 1L;
/**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
private String id;
/**鍒涘缓浜�*/
@@ -47,72 +46,58 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
/**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
private Integer delFlag;
/**宸ュ崟鍙�*/
- @Excel(name = "宸ュ崟鍙�", width = 15)
@ApiModelProperty(value = "宸ュ崟鍙�")
private String orderNum;
/**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
@Dict(dictTable = "eam_equipment", dicCode = "equipment_code", dicText = "id")
private String equipmentId;
/**鏍囧噯ID*/
- @Excel(name = "淇濆吇鏍囧噯ID", width = 15)
@ApiModelProperty(value = "淇濆吇鏍囧噯ID")
@Dict(dictTable = "eam_maintenance_standard", dicCode = "standard_code", dicText = "id")
private String standardId;
/**鐐规鏃ユ湡*/
- @Excel(name = "鐐规鏃ユ湡锛堣鍒掞級", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鐐规鏃ユ湡")
private Date inspectionDate;
/**鐐规杩囨湡鏃堕棿*/
- @Excel(name = "鐐规杩囨湡鏃堕棿", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鐐规杩囨湡鏃堕棿")
private Date expirationTime;
/**鐐规鏃堕棿*/
- @Excel(name = "鐐规鏃堕棿锛堝疄闄咃級", width = 15, 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 operateTime;
/**鐐规浜�*/
- @Excel(name = "鐐规浜�", width = 15)
@ApiModelProperty(value = "鐐规浜�-鏄鍙栦汉")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String operator;
/**鍒涘缓鏂瑰紡*/
- @Excel(name = "鍒涘缓鏂瑰紡", width = 15)
@ApiModelProperty(value = "鍒涘缓鏂瑰紡")
private String creationMethod;
/**鐐规鐘舵��*/
- @Excel(name = "鐐规鐘舵��", width = 15)
@ApiModelProperty(value = "鐐规鐘舵�� 寰呯偣妫�-寰呯‘璁�-宸插畬鎴�")
private String inspectionStatus;
/**鐝粍闀跨‘璁�*/
- @Excel(name = "鐝粍闀跨‘璁�", width = 15)
@ApiModelProperty(value = "鐝粍闀跨‘璁�--棰嗗彇鍚庝骇鐢�")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String confirmUser;
/**纭鏃堕棿*/
- @Excel(name = "纭鏃堕棿", width = 15, 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;
/**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞-鐐规宸ュ崟鍒涘缓澶囨敞")
private String remark;
/**鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧*/
- @Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧-鎵ц鏃�", width = 15)
@ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
private String imageFiles;
@@ -124,11 +109,11 @@
@ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
private List<EamInspectionOrderDetail> tableDetailList;
- /**澶勭悊绫诲瀷*/
- @ApiModelProperty(value = "澶勭悊绫诲瀷")
- private String dealType;
-
- /**澶勭悊鎰忚*/
- @ApiModelProperty(value = "澶勭悊鎰忚")
- private String dealSuggestion;
+ /**纭鎰忚*/
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /** 纭绫诲瀷 1 閫氳繃 2 椹冲洖 */
+ @ApiModelProperty(value = "纭绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
+ private String confirmDealType;
}
--
Gitblit v1.9.3