From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 119 insertions(+), 0 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
new file mode 100644
index 0000000..fcaa20b
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java
@@ -0,0 +1,119 @@
+package org.jeecg.modules.eam.request;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+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.EamInspectionOrderDetail;
+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;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class EamInspectionOrderRequest extends FlowTaskVo implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**涓婚敭*/
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String createBy;
+ /**鍒涘缓鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag;
+ /**宸ュ崟鍙�*/
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String orderNum;
+ /**璁惧ID*/
+ @ApiModelProperty(value = "璁惧ID")
+ @Dict(dictTable = "eam_equipment", dicCode = "equipment_code", dicText = "id")
+ private String equipmentId;
+ /**鏍囧噯ID*/
+ @ApiModelProperty(value = "淇濆吇鏍囧噯ID")
+ @Dict(dictTable = "eam_maintenance_standard", dicCode = "standard_code", dicText = "id")
+ private String standardId;
+ /**鐐规鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鐐规鏃ユ湡")
+ private Date inspectionDate;
+ /**鐐规杩囨湡鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鐐规杩囨湡鏃堕棿")
+ private Date expirationTime;
+ /**鐐规鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鐐规鏃堕棿")
+ private Date operateTime;
+ /**鐐规浜�*/
+ @ApiModelProperty(value = "鐐规浜�-鏄鍙栦汉")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String operator;
+ /**鍒涘缓鏂瑰紡*/
+ @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ private String creationMethod;
+ /**鐐规鐘舵��*/
+ @ApiModelProperty(value = "鐐规鐘舵�� 寰呯偣妫�-寰呯‘璁�-宸插畬鎴�")
+ private String inspectionStatus;
+ /**鐝粍闀跨‘璁�*/
+ @ApiModelProperty(value = "鐝粍闀跨‘璁�--棰嗗彇鍚庝骇鐢�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String confirmUser;
+ /**纭鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "纭鏃堕棿")
+ private Date confirmTime;
+ /**澶囨敞*/
+ @ApiModelProperty(value = "澶囨敞-鐐规宸ュ崟鍒涘缓澶囨敞")
+ private String remark;
+ /**鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧*/
+ @ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
+ private String imageFiles;
+
+ /**涓婁紶鏂囦欢瀵圭郴*/
+ @ApiModelProperty(value = "涓婁紶鏂囦欢瀵硅薄")
+ private List<FileUploadResult> fileList;
+
+ /**鍒楄〃 淇濆吇椤规槑缁�*/
+ @ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
+ private List<EamInspectionOrderDetail> tableDetailList;
+
+ /**纭鎰忚*/
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /** 纭绫诲瀷 1 閫氳繃 2 椹冲洖 */
+ @ApiModelProperty(value = "纭绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
+ private String confirmDealType;
+}
--
Gitblit v1.9.3