From 99d6db0aab044b740ce02f57872c1e38ae647b58 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 19:00:50 +0800
Subject: [PATCH] 三不原则分析 中心修改 台账导入导出字段修改
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportThreeNoSpare.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportThreeNoSpare.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportThreeNoSpare.java
index 6f80781..8e57471 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportThreeNoSpare.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportThreeNoSpare.java
@@ -56,7 +56,7 @@
@Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
- private String delFlag;
+ private Integer delFlag;
/**鎶ヤ慨ID*/
@Excel(name = "鎶ヤ慨ID", width = 15)
@ApiModelProperty(value = "鎶ヤ慨ID")
@@ -65,13 +65,18 @@
@Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
+ /**鎻愪氦鐘舵��*/
+ @Excel(name = "鎻愪氦鐘舵��", width = 15)
+ @ApiModelProperty(value = "鎻愪氦鐘舵��")
+ @Dict(dicCode = "report_three_no_spare_submit_status")
+ private String submitStatus;
/**鍘熷洜鍒嗘瀽*/
@Excel(name = "鍘熷洜鍒嗘瀽", width = 15)
@ApiModelProperty(value = "鍘熷洜鍒嗘瀽")
private String causeAnalysis;
- /**鍩硅鏁欒偛鏄� 鍚�*/
- @Excel(name = "鍩硅鏁欒偛鏄� 鍚�", width = 15)
- @ApiModelProperty(value = "鍩硅鏁欒偛鏄� 鍚�")
+ /**鍩硅鏁欒偛*/
+ @Excel(name = "鍩硅鏁欒偛", width = 15)
+ @ApiModelProperty(value = "鍩硅鏁欒偛")
private String isTrainingEducation;
/**鍩硅褰㈠紡*/
@Excel(name = "鍩硅褰㈠紡", width = 15)
@@ -91,4 +96,38 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鍩硅鏃堕棿")
private Date trainingUserTime;
+ /**棰勯槻鎺柦*/
+ @Excel(name = "棰勯槻鎺柦", width = 15)
+ @ApiModelProperty(value = "棰勯槻鎺柦")
+ private String preventionMeasures;
+ /**鍗曚綅棰嗗*/
+ @Excel(name = "鍗曚綅棰嗗", width = 15)
+ @ApiModelProperty(value = "鍗曚綅棰嗗")
+ private String unitLeader;
+ /**棰嗗鎰忚*/
+ @Excel(name = "棰嗗鎰忚", width = 15)
+ @ApiModelProperty(value = "棰嗗鎰忚")
+ private String leaderOpinion;
+ /**棰嗗纭鏃堕棿*/
+ @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 leaderConfirmTime;
+ /**棰嗗纭缁撴灉*/
+ @Excel(name = "棰嗗纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "棰嗗纭缁撴灉")
+ private String leaderConfirmResult;
+ /**浜嬫晠鐜拌薄*/
+ @Excel(name = "浜嬫晠鐜拌薄", width = 15)
+ @ApiModelProperty(value = "浜嬫晠鐜拌薄")
+ private transient String accidentPhenomenon;
+ /**閲囧彇鎺柦*/
+ @Excel(name = "閲囧彇鎺柦", width = 15)
+ @ApiModelProperty(value = "閲囧彇鎺柦")
+ private transient String measure;
+ /**閫犳垚缁撴灉*/
+ @Excel(name = "閫犳垚缁撴灉", width = 15)
+ @ApiModelProperty(value = "閫犳垚缁撴灉")
+ private transient String causingResults;
}
--
Gitblit v1.9.3