From ce1cfcb9b9176ddb1f47c9eb4cb2232b080bdbf9 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 25 七月 2025 14:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportAccidentsRegister.java | 174 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 120 insertions(+), 54 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportAccidentsRegister.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportAccidentsRegister.java
index 9631af9..c979f73 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportAccidentsRegister.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportAccidentsRegister.java
@@ -1,10 +1,7 @@
package org.jeecg.modules.eam.entity;
import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
import java.util.Date;
-import java.math.BigDecimal;
-
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -63,6 +60,10 @@
@Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
+ /**鐧昏鐘舵��*/
+ @ApiModelProperty(value = "鐧昏鐘舵��")
+ @Dict(dicCode = "eam_report_accidents_register_status")
+ private String registerStatus;
/**鏄惁鏈夎澶囨搷浣滆瘉 鏄惁*/
@Excel(name = "鏄惁鏈夎澶囨搷浣滆瘉 鏄惁", width = 15)
@ApiModelProperty(value = "鏄惁鏈夎澶囨搷浣滆瘉 鏄惁")
@@ -107,6 +108,7 @@
/**鎿嶄綔宸�*/
@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")
@@ -117,10 +119,11 @@
/**鍖洪暱*/
@Excel(name = "鍖洪暱", width = 15)
@ApiModelProperty(value = "鍖洪暱")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String district;
/**鍖洪暱纭*/
@Excel(name = "鍖洪暱纭", width = 15)
- @ApiModelProperty(value = "鍖洪暱纭")
+ @ApiModelProperty(value = "鍖洪暱纭鎰忚")
private String districtConfirm;
/**鍖洪暱纭鏃堕棿*/
@Excel(name = "鍖洪暱纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
@@ -128,62 +131,76 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鍖洪暱纭鏃堕棿")
private Date districtTime;
+ /**鍖洪暱纭缁撴灉*/
+ @Excel(name = "鍖洪暱纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "鍖洪暱纭缁撴灉")
+ private String districtResult;
/**涓績涓讳换*/
@Excel(name = "涓績涓讳换", width = 15)
@ApiModelProperty(value = "涓績涓讳换")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String centerDirector;
/**涓績涓讳换纭*/
@Excel(name = "涓績涓讳换纭", width = 15)
- @ApiModelProperty(value = "涓績涓讳换纭")
+ @ApiModelProperty(value = "涓績涓讳换纭鎰忚")
private String centerDirectorConfirm;
+ /**涓績涓讳换纭缁撴灉*/
+ @Excel(name = "涓績涓讳换纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "涓績涓讳换纭缁撴灉")
+ private String centerDirectorResult;
/**涓績涓讳换纭鏃堕棿*/
@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 centerDirectorTime;
- /**缁翠慨寮�濮嬫椂闂�*/
- @Excel(name = "缁翠慨寮�濮嬫椂闂�", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ /**缁翠慨宸ョ‘璁�*/
+ @Excel(name = "缁翠慨宸ョ‘璁�", width = 15)
+ @ApiModelProperty(value = "缁翠慨宸ョ‘璁�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+ private String repairConfirm;
+ /**缁翠慨寮�濮嬫椂闂�*/
+ @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 reportStartTime;
- /**璁惧鐘舵��*/
- @Excel(name = "璁惧鐘舵��", width = 15)
+ /**璁惧鐘舵��*/
+ @Excel(name = "璁惧鐘舵��", width = 15)
@ApiModelProperty(value = "璁惧鐘舵��")
private String equipmentStatus;
- /**鍘熷洜鍒嗘瀽*/
- @Excel(name = "鍘熷洜鍒嗘瀽", width = 15)
+ /**鍘熷洜鍒嗘瀽*/
+ @Excel(name = "鍘熷洜鍒嗘瀽", width = 15)
@ApiModelProperty(value = "鍘熷洜鍒嗘瀽")
private String causeAnalysis;
- /**妫�鏌ョ粨鏋�*/
- @Excel(name = "妫�鏌ョ粨鏋�", width = 15)
+ /**妫�鏌ョ粨鏋�*/
+ @Excel(name = "妫�鏌ョ粨鏋�", width = 15)
@ApiModelProperty(value = "妫�鏌ョ粨鏋�")
private String inspectionResults;
- /**閲囧彇鎺柦*/
- @Excel(name = "閲囧彇鎺柦", width = 15)
+ /**閲囧彇鎺柦*/
+ @Excel(name = "閲囧彇鎺柦", width = 15)
@ApiModelProperty(value = "閲囧彇鎺柦")
private String takeSteps;
- /**寤鸿閲囧彇鎺柦*/
- @Excel(name = "寤鸿閲囧彇鎺柦", width = 15)
+ /**寤鸿閲囧彇鎺柦*/
+ @Excel(name = "寤鸿閲囧彇鎺柦", width = 15)
@ApiModelProperty(value = "寤鸿閲囧彇鎺柦")
private String suggestionTakeSteps;
- /**寤鸿閲囧彇鎺柦鏃堕棿*/
- @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 suggestionTakeStepsTime;
- /**缁翠慨纭*/
- @Excel(name = "缁翠慨纭", width = 15)
- @ApiModelProperty(value = "缁翠慨纭")
- private String repairConfirm;
- /**缁翠慨纭鎰忚*/
- @Excel(name = "缁翠慨纭鎰忚", width = 15)
- @ApiModelProperty(value = "缁翠慨纭鎰忚")
+ /**缁翠慨宸ョ‘璁ょ粨鏋�*/
+ @Excel(name = "缁翠慨宸ョ‘璁ょ粨鏋�", width = 15)
+ @ApiModelProperty(value = "缁翠慨宸ョ‘璁ょ粨鏋�")
+ private String repairConfirmResult;
+ /**缁翠慨宸ョ‘璁ゆ剰瑙�*/
+ @Excel(name = "缁翠慨宸ョ‘璁ゆ剰瑙�", width = 15)
+ @ApiModelProperty(value = "缁翠慨宸ョ‘璁ゆ剰瑙�")
private String repairConfirmComment;
- /**缁翠慨纭鏃堕棿*/
- @Excel(name = "缁翠慨纭鏃堕棿", width = 15, format = "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 = "缁翠慨纭鏃堕棿")
@@ -191,51 +208,70 @@
/**缁翠慨缁勯暱纭*/
@Excel(name = "缁翠慨缁勯暱纭", width = 15)
@ApiModelProperty(value = "缁翠慨缁勯暱纭")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String repairGroupLeader;
/**缁翠慨缁勯暱鎰忚*/
@Excel(name = "缁翠慨缁勯暱鎰忚", width = 15)
@ApiModelProperty(value = "缁翠慨缁勯暱鎰忚")
private String repairGroupLeaderComment;
+ /**缁翠慨缁勯暱纭缁撴灉*/
+ @Excel(name = "缁翠慨缁勯暱纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱纭缁撴灉")
+ private String repairGroupLeaderResult;
/**缁翠慨缁勯暱纭鏃堕棿*/
@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 repairGroupLeaderTime;
- /**缁翠慨缁勯暱纭*/
- @Excel(name = "缁翠慨缁勯暱纭", width = 15)
- @ApiModelProperty(value = "缁翠慨缁勯暱纭")
+ /**缁翠慨缁勯暱(鍖洪暱)纭*/
+ @Excel(name = "缁翠慨缁勯暱(鍖洪暱)纭", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱(鍖洪暱)纭")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String repairDistrict;
- /**缁翠慨缁勯暱鎰忚*/
- @Excel(name = "缁翠慨缁勯暱鎰忚", width = 15)
- @ApiModelProperty(value = "缁翠慨缁勯暱鎰忚")
+ /**缁翠慨缁勯暱(鍖洪暱)鎰忚*/
+ @Excel(name = "缁翠慨缁勯暱(鍖洪暱)鎰忚", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱(鍖洪暱)鎰忚")
private String repairDistrictComment;
- /**缁翠慨缁勯暱纭鏃堕棿*/
+ /**缁翠慨缁勯暱(鍖洪暱)纭缁撴灉*/
+ @Excel(name = "缁翠慨缁勯暱(鍖洪暱)纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱(鍖洪暱)纭缁撴灉")
+ private String repairDistrictResult;
+ /**缁翠慨缁勯暱(鍖洪暱)纭鏃堕棿*/
@Excel(name = "缁翠慨缁勯暱纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "缁翠慨缁勯暱纭鏃堕棿")
+ @ApiModelProperty(value = "缁翠慨缁勯暱(鍖洪暱)纭鏃堕棿")
private Date repairDistrictTime;
- /**鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰*/
- @Excel(name = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰", width = 15)
- @ApiModelProperty(value = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰")
- private String checkAgree;
- /**涓嶅悓鎰忓師鍥犲垎鏋�*/
- @Excel(name = "涓嶅悓鎰忓師鍥犲垎鏋�", width = 15)
- @ApiModelProperty(value = "涓嶅悓鎰忓師鍥犲垎鏋�")
- private String disagreeReason;
- /**鏁存敼鎺柦*/
- @Excel(name = "鏁存敼鎺柦", width = 15)
- @ApiModelProperty(value = "鏁存敼鎺柦")
- private String rectificationMeasures;
- /**浜嬫晠缁撹*/
- @Excel(name = "浜嬫晠缁撹", width = 15)
- @ApiModelProperty(value = "浜嬫晠缁撹")
- private String accidentConclusion;
/**鎶�鏈礋璐ｄ汉*/
@Excel(name = "鎶�鏈礋璐ｄ汉", width = 15)
@ApiModelProperty(value = "鎶�鏈礋璐ｄ汉")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String technicalDirector;
+ /**鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰*/
+ @Excel(name = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰", width = 15)
+ @ApiModelProperty(value = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰")
+ private String checkAgree;
+ /**涓嶅悓鎰忓師鍥犲垎鏋�*/
+ @Excel(name = "涓嶅悓鎰忓師鍥犲垎鏋�", width = 15)
+ @ApiModelProperty(value = "涓嶅悓鎰忓師鍥犲垎鏋�")
+ private String disagreeReason;
+ /**鏁存敼鎺柦*/
+ @Excel(name = "鏁存敼鎺柦", width = 15)
+ @ApiModelProperty(value = "鏁存敼鎺柦")
+ private String rectificationMeasures;
+ /**浜嬫晠缁撹*/
+ @Excel(name = "浜嬫晠缁撹", width = 15)
+ @ApiModelProperty(value = "浜嬫晠缁撹")
+ private String accidentConclusion;
+ /**鎶�鏈礋璐ｄ汉纭鎰忚*/
+ @Excel(name = "鎶�鏈礋璐ｄ汉纭鎰忚", width = 15)
+ @ApiModelProperty(value = "鎶�鏈礋璐ｄ汉纭鎰忚")
+ private String technicalDirectorConfirm;
+ /**鎶�鏈礋璐ｄ汉纭缁撴灉*/
+ @Excel(name = "鎶�鏈礋璐ｄ汉纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "鎶�鏈礋璐ｄ汉纭缁撴灉")
+ private String technicalDirectorResult;
/**鎶�鏈礋璐ｄ汉纭鏃堕棿*/
@Excel(name = "鎶�鏈礋璐ｄ汉纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -245,7 +281,16 @@
/**鎶�鏈富绠″绾ч瀵�*/
@Excel(name = "鎶�鏈富绠″绾ч瀵�", width = 15)
@ApiModelProperty(value = "鎶�鏈富绠″绾ч瀵�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String technicalDirectorLeader;
+ /**鎶�鏈富绠″绾ч瀵肩‘璁ゆ剰瑙�*/
+ @Excel(name = "鎶�鏈富绠″绾ч瀵肩‘璁ゆ剰瑙�", width = 15)
+ @ApiModelProperty(value = "鎶�鏈富绠″绾ч瀵肩‘璁ゆ剰瑙�")
+ private String technicalDirectorLeaderConfirm;
+ /**鎶�鏈富绠″绾ч瀵肩‘璁ょ粨鏋�*/
+ @Excel(name = "鎶�鏈富绠″绾ч瀵肩‘璁ょ粨鏋�", width = 15)
+ @ApiModelProperty(value = "鎶�鏈富绠″绾ч瀵肩‘璁ょ粨鏋�")
+ private String technicalDirectorLeaderResult;
/**鎶�鏈富绠″绾ч瀵肩‘璁ゆ椂闂�*/
@Excel(name = "鎶�鏈富绠″绾ч瀵肩‘璁ゆ椂闂�", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -255,6 +300,7 @@
/**涓荤閮ㄧ骇棰嗗*/
@Excel(name = "涓荤閮ㄧ骇棰嗗", width = 15)
@ApiModelProperty(value = "涓荤閮ㄧ骇棰嗗")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
private String technicalDirectorPart;
/**涓荤閮ㄧ骇棰嗗纭鏃堕棿*/
@Excel(name = "涓荤閮ㄧ骇棰嗗纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
@@ -262,6 +308,14 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "涓荤閮ㄧ骇棰嗗纭鏃堕棿")
private Date technicalDirectorPartTime;
+ /**涓荤閮ㄧ骇棰嗗纭鎰忚*/
+ @Excel(name = "涓荤閮ㄧ骇棰嗗纭鎰忚", width = 15)
+ @ApiModelProperty(value = "涓荤閮ㄧ骇棰嗗纭鎰忚")
+ private String technicalDirectorPartConfirm;
+ /**涓荤閮ㄧ骇棰嗗纭缁撴灉*/
+ @Excel(name = "涓荤閮ㄧ骇棰嗗纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "涓荤閮ㄧ骇棰嗗纭缁撴灉")
+ private String technicalDirectorPartResult;
//鍒楄〃灞曠ず
@TableField(exist = false)
private String equipmentCode;
@@ -271,4 +325,16 @@
private String equipmentModel;
@TableField(exist = false)
private String installationPosition;
+ /**搴熷搧浠跺彿*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "搴熷搧浠跺彿")
+ private String scrapPartNumber;
+ /**搴熷搧浠舵暟*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "搴熷搧浠舵暟")
+ private String scrapPartQuantity;
+ /**搴熷搧浠峰��*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "搴熷搧浠峰��")
+ private String scrapPartValue;
}
--
Gitblit v1.9.3