From b16d7f9fd029bf9d37bcc3c6f3cf8472a0081888 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 26 七月 2025 16:34:46 +0800
Subject: [PATCH] 设备故障登记修改与产品安全确认
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportProductHazardsQuery.java | 107 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 39 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportProductHazardsQuery.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportProductHazardsQuery.java
index f4dbee7..dd2a481 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportProductHazardsQuery.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportProductHazardsQuery.java
@@ -1,15 +1,13 @@
package org.jeecg.modules.eam.request;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -30,80 +28,102 @@
public class EamReportProductHazardsQuery implements Serializable {
private static final long serialVersionUID = 1L;
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
private String id;
- /**鍒涘缓浜�*/
+ /**鍒涘缓浜�*/
@ApiModelProperty(value = "鍒涘缓浜�")
private String createBy;
- /**鍒涘缓鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "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 createTime;
- /**鏇存柊浜�*/
+ /**鏇存柊浜�*/
@ApiModelProperty(value = "鏇存柊浜�")
private String updateBy;
- /**鏇存柊鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "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 updateTime;
- /**鎶ヤ慨ID*/
- @Excel(name = "鎶ヤ慨ID", width = 15)
+ /**鍒犻櫎鏍囪*/
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag;
+ /**鎶ヤ慨ID*/
+ @Excel(name = "鎶ヤ慨ID", width = 15)
@ApiModelProperty(value = "鎶ヤ慨ID")
private String reportId;
- /**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
+ /**璁惧ID*/
+ @Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
- /**鎿嶄綔宸�*/
- @Excel(name = "鎿嶄綔宸�", width = 15)
+ /**纭鐘舵��*/
+ @Excel(name = "纭鐘舵��", width = 15)
+ @ApiModelProperty(value = "纭鐘舵��")
+ @Dict(dicCode = "confirm_status")
+ private String confirmStatus;
+ /**鎿嶄綔宸�*/
+ @Excel(name = "鎿嶄綔宸�", width = 15)
@ApiModelProperty(value = "鎿嶄綔宸�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String confirmer;
- /**鎿嶄綔宸ョ‘璁ゆ椂闂�*/
- @Excel(name = "鎿嶄綔宸ョ‘璁ゆ椂闂�", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ /**鎿嶄綔宸ョ‘璁ゆ椂闂�*/
+ @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 confirmTime;
- /**浜у搧鎹熷け鎯呭喌*/
- @Excel(name = "浜у搧鎹熷け鎯呭喌", width = 15)
+ /**浜у搧鎹熷け鎯呭喌*/
+ @Excel(name = "浜у搧鎹熷け鎯呭喌", width = 15)
@ApiModelProperty(value = "浜у搧鎹熷け鎯呭喌")
+ @Dict(dicCode = "yn")
private String productLoss;
- /**浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽*/
- @Excel(name = "浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽", width = 15)
+ /**浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽*/
+ @Excel(name = "浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽", width = 15)
@ApiModelProperty(value = "浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽")
private String qualityAnalysis;
- /**涓荤宸ヨ壓*/
- @Excel(name = "涓荤宸ヨ壓", width = 15)
+ /**涓荤宸ヨ壓*/
+ @Excel(name = "涓荤宸ヨ壓", width = 15)
@ApiModelProperty(value = "涓荤宸ヨ壓")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String technologist;
- /**涓荤宸ヨ壓纭鏃堕棿*/
- @Excel(name = "涓荤宸ヨ壓纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ /**涓荤宸ヨ壓纭鏃堕棿*/
+ @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 technologistTime;
- /**涓荤宸ヨ壓纭鎰忚*/
- @Excel(name = "涓荤宸ヨ壓纭鎰忚", width = 15)
+ /**涓荤宸ヨ壓纭鎰忚*/
+ @Excel(name = "涓荤宸ヨ壓纭鎰忚", width = 15)
@ApiModelProperty(value = "涓荤宸ヨ壓纭鎰忚")
private String technologistComment;
- /**閮ㄧ骇棰嗗*/
- @Excel(name = "閮ㄧ骇棰嗗", width = 15)
+ /**涓荤宸ヨ壓纭缁撴灉*/
+ @Excel(name = "涓荤宸ヨ壓纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "涓荤宸ヨ壓纭缁撴灉")
+ private String technologistResult;
+ /**閮ㄧ骇棰嗗*/
+ @Excel(name = "閮ㄧ骇棰嗗", width = 15)
@ApiModelProperty(value = "閮ㄧ骇棰嗗")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String deputyDepartment;
- /**閮ㄧ骇棰嗗纭鏃堕棿*/
- @Excel(name = "閮ㄧ骇棰嗗纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ /**閮ㄧ骇棰嗗纭鏃堕棿*/
+ @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 deputyDepartmentTime;
- /**閮ㄧ骇棰嗗纭鎰忚*/
- @Excel(name = "閮ㄧ骇棰嗗纭鎰忚", width = 15)
+ /**閮ㄧ骇棰嗗纭鎰忚*/
+ @Excel(name = "閮ㄧ骇棰嗗纭鎰忚", width = 15)
@ApiModelProperty(value = "閮ㄧ骇棰嗗纭鎰忚")
private String deputyDepartmentComment;
+ /**閮ㄧ骇棰嗗纭缁撴灉*/
+ @Excel(name = "閮ㄧ骇棰嗗纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "閮ㄧ骇棰嗗纭缁撴灉")
+ private String deputyDepartmentResult;
//鍒楄〃灞曠ず
@TableField(exist = false)
private String equipmentCode;
@@ -115,4 +135,13 @@
private String installationPosition;
private String column;
private String order;
+ /**鎵规鍙�*/
+ @TableField(exist = false)
+ private String batchNumber;
+ /**鍔犲伐闆朵欢鍙�*/
+ @TableField(exist = false)
+ private String processingPart;
+ /**浠舵暟*/
+ @TableField(exist = false)
+ private String quantity;
}
--
Gitblit v1.9.3