From 00311f718b9ed42d48305b8ffe98ef79fdb3e716 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 04 九月 2025 15:15:29 +0800
Subject: [PATCH] 设备管理技术状态鉴定、设备保养、设备维修下所有列表添加使用部门展示
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java | 173 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 149 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 e1985b7..4f25045 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
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.request;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
@@ -45,7 +46,7 @@
@Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
- private String delFlag;
+ private Integer delFlag;
/**鎶ヤ慨ID*/
@Excel(name = "鎶ヤ慨ID", width = 15)
@ApiModelProperty(value = "鎶ヤ慨ID")
@@ -54,6 +55,14 @@
@Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
+ /**HF缂栫爜*/
+ @Excel(name = "HF缂栫爜", width = 15)
+ @ApiModelProperty(value = "HF缂栫爜")
+ private String hfCode;
+ /**鐧昏鐘舵��*/
+ @ApiModelProperty(value = "鐧昏鐘舵��")
+ @Dict(dicCode = "eam_report_accidents_register_status")
+ private String registerStatus;
/**鏄惁鏈夎澶囨搷浣滆瘉 鏄惁*/
@Excel(name = "鏄惁鏈夎澶囨搷浣滆瘉 鏄惁", width = 15)
@ApiModelProperty(value = "鏄惁鏈夎澶囨搷浣滆瘉 鏄惁")
@@ -98,6 +107,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")
@@ -108,10 +118,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")
@@ -119,20 +130,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")
@@ -165,16 +190,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 = "缁翠慨纭鏃堕棿")
@@ -182,31 +207,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 = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰")
@@ -223,10 +263,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")
@@ -236,7 +280,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")
@@ -246,6 +299,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")
@@ -253,6 +307,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;
@@ -264,4 +326,67 @@
private String installationPosition;
private String column;
private String order;
+ /**搴熷搧浠跺彿*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "搴熷搧浠跺彿")
+ private String scrapPartNumber;
+ /**搴熷搧浠舵暟*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "搴熷搧浠舵暟")
+ private String scrapPartQuantity;
+ /**搴熷搧浠峰��*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "搴熷搧浠峰��")
+ private String scrapPartValue;
+ /**
+ * 鍏徃
+ */
+ @ApiModelProperty(value = "鍏徃")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @TableField(exist = false)
+ private transient String gsfactoryOrgCode;
+
+ /**
+ * 涓績
+ */
+ @ApiModelProperty(value = "涓績")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @TableField(exist = false)
+ private transient String zxfactoryOrgCode;
+
+ /**
+ * 宸ュ尯
+ */
+ @ApiModelProperty(value = "宸ュ尯")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @TableField(exist = false)
+ private transient String gqfactoryOrgCode;
+
+ /**
+ * 宸ユ
+ */
+ @ApiModelProperty(value = "涓績/宸ュ尯/宸ユ")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @TableField(exist = false)
+ private String factoryOrgCode;
+
+ public void setFactoryOrgCode(String factoryOrgCode){
+ this.factoryOrgCode = factoryOrgCode;
+ if(StrUtil.isNotEmpty(factoryOrgCode)){
+ if(factoryOrgCode.length()==12){
+ this.gqfactoryOrgCode = factoryOrgCode.substring(0,9);
+ this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+ this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+ }
+
+ if(factoryOrgCode.length()==9){
+ this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+ this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+ }
+
+ if(factoryOrgCode.length()==6){
+ this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+ }
+ }
+ }
}
--
Gitblit v1.9.3