From 86ba6f759117d9437bcaab902efa29e8cf72c815 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 25 七月 2025 17:51:36 +0800
Subject: [PATCH] 设备故障登记
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java | 101 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 77 insertions(+), 24 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java
index 426355f..820190d 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java
@@ -45,7 +45,7 @@
@Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
- private String delFlag;
+ private Integer delFlag;
/**鎶ヤ慨ID*/
@Excel(name = "鎶ヤ慨ID", width = 15)
@ApiModelProperty(value = "鎶ヤ慨ID")
@@ -102,6 +102,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")
@@ -112,10 +113,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")
@@ -123,20 +125,34 @@
@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)
+ @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")
@@ -169,16 +185,16 @@
@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 = "缁翠慨纭鏃堕棿")
@@ -186,31 +202,46 @@
/**缁翠慨缁勯暱纭*/
@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 = "鎶�鏈礋璐ｄ汉")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+ private String technicalDirector;
/**鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰*/
@Excel(name = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰", width = 15)
@ApiModelProperty(value = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰")
@@ -227,10 +258,14 @@
@Excel(name = "浜嬫晠缁撹", width = 15)
@ApiModelProperty(value = "浜嬫晠缁撹")
private String accidentConclusion;
- /**鎶�鏈礋璐ｄ汉*/
- @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")
@@ -240,7 +275,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")
@@ -250,6 +294,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")
@@ -257,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;
--
Gitblit v1.9.3