From 0a19d4923b0a048aee0cda91c37f25bc6e140d54 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 16 七月 2025 21:01:24 +0800
Subject: [PATCH] 修改接收字段
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java | 124 +++++++++++++++++++++++++++++++---------
1 files changed, 95 insertions(+), 29 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
index d2df4bf..7d5977a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceRequest.java
@@ -6,9 +6,10 @@
import lombok.Data;
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.EamThirdMaintenanceOrderDetail;
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;
@@ -18,55 +19,120 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="涓変繚瀵硅薄", description="涓変繚")
+@ApiModel(value = "涓変繚瀵硅薄", description = "涓変繚")
public class EamThirdMaintenanceRequest extends FlowTaskVo implements Serializable {
- /**涓婚敭*/
+ private static final long serialVersionUID = -385597100123768119L;
+
+ /**
+ * 涓婚敭
+ */
@ApiModelProperty(value = "涓婚敭")
private String id;
- /**宸ュ崟鍙�*/
+ /**
+ * 宸ュ崟鍙�
+ */
@ApiModelProperty(value = "宸ュ崟鍙�")
private String orderNum;
- /**璁惧ID*/
+ /**
+ * 璁惧ID
+ */
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
- /**鏍囧噯ID*/
+ /**
+ * 鏍囧噯ID
+ */
@ApiModelProperty(value = "鏍囧噯ID")
private String standardId;
- /**淇濆吇鏃ユ湡*/
+ /**
+ * 淇濆吇鏃ユ湡
+ */
@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 = "缁翠慨浜�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String repairman;
+ /**
+ * 淇濆吇鐘舵��
+ */
+ @ApiModelProperty(value = "淇濆吇鐘舵��;寰呬繚鍏汇�佷繚鍏讳腑銆佸緟妫�鏌ャ�佹搷浣滀汉绛惧瓧銆佺淮淇汉绛惧瓧銆佺淮淇涓讳换绛惧瓧銆佽澶囨鏌ヤ汉绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡鍙栨秷")
+ @Dict(dicCode = "third_maintenance_status")
+ private String maintenanceStatus;
+ /**
+ * 澶囨敞
+ */
@ApiModelProperty(value = "澶囨敞")
private String remark;
- /**鍒涘缓鏂瑰紡*/
+ /**
+ * 鍒涘缓鏂瑰紡
+ */
@ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ @Dict(dicCode = "order_creation_method")
private String creationMethod;
- /**鍒楄〃 淇濆吇椤规槑缁�*/
+ /**
+ * 璁惧鍔熻兘鏄惁榻愬;鏄惁
+ */
+ @ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
+ @Dict(dicCode = "yn")
+ private String fullyFunctional;
+ /**
+ * 璁惧鍔熻兘鏄惁榻愬;鏄惁
+ */
+ @ApiModelProperty(value = "璁惧鍔熻兘鏄惁姝ｅ父杩愯浆;鏄惁")
+ @Dict(dicCode = "yn")
+ private String runningNormally;
+ /**
+ * 闂鎻忚堪
+ */
+ @ApiModelProperty(value = "闂鎻忚堪")
+ private String problemDescription;
+ /**
+ * 鍒楄〃 淇濆吇椤规槑缁�
+ */
@ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
private List<EamThirdMaintenanceOrderDetail> tableDetailList;
- /**鍒犻櫎 淇濆吇椤规槑缁�*/
+ /**
+ * 鍒犻櫎 淇濆吇椤规槑缁�
+ */
@ApiModelProperty(value = "鍒犻櫎 淇濆吇椤规槑缁�")
private List<EamThirdMaintenanceOrderDetail> removeDetailList;
- //纭鎿嶄綔
- /**纭鎰忚*/
- @ApiModelProperty(value = "纭鎰忚")
- private String confirmComment;
- @ApiModelProperty(value = "纭绫诲瀷")
- private String confirmDealType;
- /**棰嗗纭鎰忚*/
- @ApiModelProperty(value = "棰嗗纭鎰忚")
- private String leaderConfirmComment;
+ /**
+ * 鎿嶄綔浜虹瀛�
+ */
+ @ApiModelProperty(value = "鎿嶄綔浜虹瀛�")
+ private String operatorSignatureResult;
+ /**
+ * 鍗忓姪鎿嶄綔浜�
+ */
+ @ApiModelProperty(value = "鍗忓姪鎿嶄綔浜�")
+ private String assistantOperator;
+
+ /**
+ * 缁翠慨浜虹瀛�
+ */
+ @ApiModelProperty(value = "缁翠慨浜虹瀛�")
+ private String repairmanSignatureResult;
+ /**
+ * 鍗忓姪缁翠慨浜�
+ */
+ @Excel(name = "鍗忓姪缁翠慨浜�", width = 15)
+ @ApiModelProperty(value = "鍗忓姪缁翠慨浜�")
+ private String assistantRepairman;
+ /**
+ * 缁翠慨瀹や富浠荤瀛�
+ */
+ @ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛�")
+ private String repairManagerSignatureResult;
+ /**
+ * 璁惧妫�鏌ヤ汉绛惧瓧
+ */
+ @ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧")
+ private String inspectorSignatureResult;
+
}
--
Gitblit v1.9.3