From 8918b2f8444db69be6887c9a0959d13e164bbddb Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 27 八月 2025 14:29:32 +0800
Subject: [PATCH] 设备二保定时服务开发，填充车间二保计划数据，三不放过批量导出接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamSecondMaintenanceRequest.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 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 8fbff40..3831e50 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
@@ -8,7 +8,9 @@
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;
@@ -53,6 +55,20 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date maintenanceDate;
/**
+ * 閿佸畾宸ュ崟鏃ユ湡
+ */
+ @ApiModelProperty(value = "閿佸畾宸ュ崟鏃ユ湡;鎻愬墠55澶╅攣瀹氬伐鍗�")
+ @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;
+ /**
* 瀹為檯寮�濮嬫椂闂�
*/
@ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
@@ -93,6 +109,12 @@
@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 ;
@@ -107,6 +129,12 @@
/** 妫�鏌ヤ汉纭 */
@ApiModelProperty(name = "妫�鏌ヤ汉纭",notes = "")
private String inspector;
+ /**
+ * 妫�鏌ヤ汉纭缁撴灉
+ */
+ @ApiModelProperty(name = "妫�鏌ヤ汉纭缁撴灉",notes = "")
+ @Dict(dicCode = "approve_reject")
+ private String inspectorResult;
/** 妫�鏌ヤ汉鎰忚 */
@ApiModelProperty(name = "妫�鏌ヤ汉鎰忚",notes = "")
private String inspectConfirmComment;
@@ -122,4 +150,9 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ /**鍒楄〃 鏄庣粏*/
+ @ApiModelProperty(value = "鍒楄〃 缁翠慨宸ユ槑缁�")
+ private List<EamSecondMaintenanceOrderDetail> tableDetailList;;
+
}
--
Gitblit v1.9.3