From 2d3ded65b3c30b4f5cba6080d9c28e16a0b296cc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 15 七月 2025 20:31:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java | 141 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 108 insertions(+), 33 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java
index bcad399..de66e47 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java
@@ -7,8 +7,12 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.api.vo.FileUploadResult;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrderDetail;
+import org.jeecg.modules.eam.entity.EamWeekInspectionDetail;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
+import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -24,49 +28,120 @@
/**涓婚敭*/
@ApiModelProperty(value = "涓婚敭")
private String id;
- /**宸ュ崟鍙�*/
+ /**
+ * 宸ュ崟鍙�
+ */
+ @Excel(name = "宸ュ崟鍙�", width = 15)
@ApiModelProperty(value = "宸ュ崟鍙�")
private String orderNum;
- /**璁惧ID*/
+ /**
+ * 璁惧ID
+ */
+ @Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
- /**鏍囧噯ID*/
+ /**
+ * 鏍囧噯ID
+ */
+ @Excel(name = "鏍囧噯ID", width = 15)
@ApiModelProperty(value = "鏍囧噯ID")
+ @Dict(dicCode = "eam_maintenance_standard, standard_name, id")
private String standardId;
- /**淇濆吇鏃ユ湡*/
- @ApiModelProperty(value = "淇濆吇鏃ユ湡")
+ /**
+ * 璁″垝淇濆吇鏃ユ湡
+ */
+ @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date maintenanceDate;
- /**淇濆吇浜�*/
- @ApiModelProperty(value = "淇濆吇浜�")
- private String operator;
- /**淇濆吇鍥剧墖*/
- @ApiModelProperty(value = "淇濆吇鍥剧墖")
- private String imageFiles;
- /**淇濆吇鍥剧墖*/
- @ApiModelProperty(value = "淇濆吇鍥剧墖")
- private List<FileUploadResult> imageFilesResult;
- /**澶囨敞*/
+ /**
+ * 瀹為檯寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actualStartTime;
+ /**
+ * 瀹為檯缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actualEndTime;
+ /** 鎿嶄綔宸� */
+ @ApiModelProperty(value = "鎿嶄綔宸�")
+ private String operator ;
+ /** 缁翠慨宸� */
+ @ApiModelProperty(value = "缁翠慨宸�")
+ private String repairman ;
+ /**
+ * 淇濆吇鐘舵�� 寰呬繚鍏汇�佷繚鍏讳腑銆佺鐞嗗憳纭銆佹鏌ヤ汉纭銆佸凡瀹屾垚
+ */
+ @Excel(name = "淇濆吇鐘舵��", width = 15)
+ @ApiModelProperty(value = "淇濆吇鐘舵��")
+ @Dict(dicCode = "second_maintenance_status")
+ private String maintenanceStatus;
+ /**
+ * 鍒涘缓鏂瑰紡
+ */
+ @Excel(name = "鍒涘缓鏂瑰紡", width = 15)
+ @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ @Dict(dicCode = "order_creation_method")
+ private String creationMethod;
+ /**
+ * 绠＄悊鍛樼‘璁�
+ */
+ @Excel(name = "绠＄悊鍛樼‘璁�", width = 15)
+ @ApiModelProperty(value = "绠＄悊鍛樼‘璁�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String manageUser;
+ /**
+ * 绠＄悊鍛樼‘璁ょ粨鏋�
+ */
+ @ApiModelProperty(value = "绠＄悊鍛樼‘璁ょ粨鏋�")
+ @Dict(dicCode = "approve_reject")
+ private String manageUserResult;
+ /** 闂鎻忚堪;榛樿 鏃� */
+ @ApiModelProperty(name = "闂鎻忚堪",notes = "榛樿 鏃�")
+ private String problemDescription ;
+ /** 澶勭悊鎻忚堪;榛樿 鏃� */
+ @ApiModelProperty(name = "澶勭悊鎻忚堪",notes = "榛樿 鏃�")
+ private String dealDescription ;
+ /** 绠＄悊鍛樼‘璁ゆ椂闂� */
+ @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 ;
+ /** 妫�鏌ヤ汉纭 */
+ @ApiModelProperty(name = "妫�鏌ヤ汉纭",notes = "")
+ 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;
+ /** HF缂栫爜 */
+ @ApiModelProperty(name = "HF缂栫爜",notes = "")
+ private String hfCode;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
- /**鍒涘缓鏂瑰紡*/
- @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
- private String creationMethod;
- /**鍒楄〃 淇濆吇椤规槑缁�*/
- @ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
- private List<EamSecondMaintenanceOrderDetail> tableDetailList;
- /**鍒犻櫎 淇濆吇椤规槑缁�*/
- @ApiModelProperty(value = "鍒犻櫎 淇濆吇椤规槑缁�")
- private List<EamSecondMaintenanceOrderDetail> removeDetailList;
- //纭鎿嶄綔
- /**纭鎰忚*/
- @ApiModelProperty(value = "纭鎰忚")
- private String confirmComment;
- @ApiModelProperty(value = "纭绫诲瀷")
- private String confirmDealType;
- /**棰嗗纭鎰忚*/
- @ApiModelProperty(value = "棰嗗纭鎰忚")
- private String leaderConfirmComment;
+ /**鍒楄〃 缁翠慨宸ユ槑缁�*/
+ @ApiModelProperty(value = "鍒楄〃 缁翠慨宸ユ槑缁�")
+ private List<EamSecondMaintenanceOrderDetail> repairmanDetailList;;
+
+ /**鍒楄〃 鎿嶄綔宸ユ槑缁�*/
+ @ApiModelProperty(value = "鍒楄〃 缁翠慨宸ユ槑缁�")
+ private List<EamSecondMaintenanceOrderDetail> operatorDetailList;;
}
--
Gitblit v1.9.3