From f1b7de2d0bf989ff38b0bd2c52d4bb8b753af42c Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 24 七月 2025 18:13:59 +0800
Subject: [PATCH] 设备维修
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportAccidentsRegister.java | 92 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 76 insertions(+), 16 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..02e35bd 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
@@ -63,6 +63,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 = "鏄惁鏈夎澶囨搷浣滆瘉 鏄惁")
@@ -120,7 +124,7 @@
private String district;
/**鍖洪暱纭*/
@Excel(name = "鍖洪暱纭", width = 15)
- @ApiModelProperty(value = "鍖洪暱纭")
+ @ApiModelProperty(value = "鍖洪暱纭鎰忚")
private String districtConfirm;
/**鍖洪暱纭鏃堕棿*/
@Excel(name = "鍖洪暱纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
@@ -128,14 +132,22 @@
@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 = "涓績涓讳换")
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")
@@ -174,16 +186,20 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "寤鸿閲囧彇鎺柦鏃堕棿")
private Date suggestionTakeStepsTime;
- /**缁翠慨纭*/
- @Excel(name = "缁翠慨纭", width = 15)
+ /**缁翠慨宸ョ‘璁�*/
+ @Excel(name = "缁翠慨宸ョ‘璁�", width = 15)
@ApiModelProperty(value = "缁翠慨纭")
private String repairConfirm;
- /**缁翠慨纭鎰忚*/
- @Excel(name = "缁翠慨纭鎰忚", width = 15)
+ /**缁翠慨宸ョ‘璁ょ粨鏋�*/
+ @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 = "缁翠慨纭鏃堕棿")
@@ -196,25 +212,33 @@
@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 = "缁翠慨缁勯暱(鍖洪暱)纭")
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)
@@ -236,6 +260,14 @@
@Excel(name = "鎶�鏈礋璐ｄ汉", width = 15)
@ApiModelProperty(value = "鎶�鏈礋璐ｄ汉")
private String technicalDirector;
+ /**鎶�鏈礋璐ｄ汉纭鎰忚*/
+ @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")
@@ -246,6 +278,14 @@
@Excel(name = "鎶�鏈富绠″绾ч瀵�", width = 15)
@ApiModelProperty(value = "鎶�鏈富绠″绾ч瀵�")
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")
@@ -262,6 +302,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 +319,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