From 58f63d0e061123b15f780d294272d8a461f183db Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 23 七月 2025 17:41:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportProductHazardsDto.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 114 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportProductHazardsDto.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportProductHazardsDto.java
new file mode 100644
index 0000000..572fd4f
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportProductHazardsDto.java
@@ -0,0 +1,114 @@
+package org.jeecg.modules.eam.dto;
+
+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.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.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 浜у搧瀹夊叏闅愭偅纭
+ * @Author: jeecg-boot
+ * @Date: 2025-07-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("eam_report_product_hazards")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class EamReportProductHazardsDto {
+
+ /**涓婚敭*/
+ @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")
+ @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")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏇存柊鏃ユ湡")
+ private Date updateTime;
+ /**鎶ヤ慨ID*/
+ @Excel(name = "鎶ヤ慨ID", width = 15)
+ @ApiModelProperty(value = "鎶ヤ慨ID")
+ private String reportId;
+ /**璁惧ID*/
+ @Excel(name = "璁惧ID", width = 15)
+ @ApiModelProperty(value = "璁惧ID")
+ private String equipmentId;
+ /**鎿嶄綔宸�*/
+ @Excel(name = "鎿嶄綔宸�", width = 15)
+ @ApiModelProperty(value = "鎿嶄綔宸�")
+ private String confirmer;
+ /**鎿嶄綔宸ョ‘璁ゆ椂闂�*/
+ @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)
+ @ApiModelProperty(value = "浜у搧鎹熷け鎯呭喌")
+ private String productLoss;
+ /**浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽*/
+ @Excel(name = "浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽", width = 15)
+ @ApiModelProperty(value = "浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽")
+ private String qualityAnalysis;
+ /**涓荤宸ヨ壓*/
+ @Excel(name = "涓荤宸ヨ壓", width = 15)
+ @ApiModelProperty(value = "涓荤宸ヨ壓")
+ private String technologist;
+ /**涓荤宸ヨ壓纭鏃堕棿*/
+ @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)
+ @ApiModelProperty(value = "涓荤宸ヨ壓纭鎰忚")
+ private String technologistComment;
+ /**閮ㄧ骇棰嗗*/
+ @Excel(name = "閮ㄧ骇棰嗗", width = 15)
+ @ApiModelProperty(value = "閮ㄧ骇棰嗗")
+ private String deputyDepartment;
+ /**閮ㄧ骇棰嗗纭鏃堕棿*/
+ @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)
+ @ApiModelProperty(value = "閮ㄧ骇棰嗗纭鎰忚")
+ private String deputyDepartmentComment;
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
+ @TableField(exist = false)
+ private String installationPosition;
+}
--
Gitblit v1.9.3