From 3cd08b58d97c10dd90047f1887994b456002043c Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 26 八月 2025 11:51:46 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 1 -
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportAccidentsRegisterDto.java | 14 ++++++++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamRepairOrderService.java | 1 -
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 1 +
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportAccidentsRegisterMapper.xml | 1 +
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderDto.java | 7 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardDetailServiceImpl.java | 1 -
7 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderDto.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderDto.java
index c602432..f2bf84d 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderDto.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderDto.java
@@ -55,6 +55,7 @@
/**鎶ヤ慨浜�*/
@Excel(name = "鎶ヤ慨浜�", width = 15)
@ApiModelProperty(value = "鎶ヤ慨浜�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String reportPerson;
/**鎶ヤ慨ID*/
private String reportId;
@@ -72,6 +73,12 @@
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date actualEndTime ;
+ /** 缁翠慨鏃堕暱*/
+ @ApiModelProperty(name = "缁翠慨鏃堕暱",notes = "")
+ private String repairDuration;
+ /**鏁呴殰鏃堕暱*/
+ @ApiModelProperty(name = "鏁呴殰鏃堕暱",notes = "")
+ private String faultDuration;
/** 缁翠慨纭 */
private String repairConfirm ;
/** 缁翠慨纭鎰忚 */
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportAccidentsRegisterDto.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportAccidentsRegisterDto.java
index 6793989..ee9818f 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportAccidentsRegisterDto.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportAccidentsRegisterDto.java
@@ -113,6 +113,7 @@
/**鎿嶄綔宸�*/
@Excel(name = "鎿嶄綔宸�", width = 15)
@ApiModelProperty(value = "鎿嶄綔宸�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String confirmer;
/**鎿嶄綔宸ョ‘璁ゆ椂闂�*/
@Excel(name = "鎿嶄綔宸ョ‘璁ゆ椂闂�", width = 15, format = "yyyy-MM-dd")
@@ -123,6 +124,7 @@
/**鍖洪暱*/
@Excel(name = "鍖洪暱", width = 15)
@ApiModelProperty(value = "鍖洪暱")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String district;
/**鍖洪暱纭*/
@Excel(name = "鍖洪暱纭", width = 15)
@@ -141,6 +143,7 @@
/**涓績涓讳换*/
@Excel(name = "涓績涓讳换", width = 15)
@ApiModelProperty(value = "涓績涓讳换")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String centerDirector;
/**涓績涓讳换纭*/
@Excel(name = "涓績涓讳换纭", width = 15)
@@ -191,6 +194,7 @@
/**缁翠慨宸ョ‘璁�*/
@Excel(name = "缁翠慨宸ョ‘璁�", width = 15)
@ApiModelProperty(value = "缁翠慨纭")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairConfirm;
/**缁翠慨宸ョ‘璁ょ粨鏋�*/
@Excel(name = "缁翠慨宸ョ‘璁ょ粨鏋�", width = 15)
@@ -209,6 +213,7 @@
/**缁翠慨缁勯暱纭*/
@Excel(name = "缁翠慨缁勯暱纭", width = 15)
@ApiModelProperty(value = "缁翠慨缁勯暱纭")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairGroupLeader;
/**缁翠慨缁勯暱鎰忚*/
@Excel(name = "缁翠慨缁勯暱鎰忚", width = 15)
@@ -227,6 +232,7 @@
/**缁翠慨缁勯暱(鍖洪暱)纭*/
@Excel(name = "缁翠慨缁勯暱(鍖洪暱)纭", width = 15)
@ApiModelProperty(value = "缁翠慨缁勯暱(鍖洪暱)纭")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairDistrict;
/**缁翠慨缁勯暱(鍖洪暱)鎰忚*/
@Excel(name = "缁翠慨缁勯暱(鍖洪暱)鎰忚", width = 15)
@@ -261,6 +267,7 @@
/**鎶�鏈礋璐ｄ汉*/
@Excel(name = "鎶�鏈礋璐ｄ汉", width = 15)
@ApiModelProperty(value = "鎶�鏈礋璐ｄ汉")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String technicalDirector;
/**鎶�鏈礋璐ｄ汉纭鎰忚*/
@Excel(name = "鎶�鏈礋璐ｄ汉纭鎰忚", width = 15)
@@ -279,6 +286,7 @@
/**鎶�鏈富绠″绾ч瀵�*/
@Excel(name = "鎶�鏈富绠″绾ч瀵�", width = 15)
@ApiModelProperty(value = "鎶�鏈富绠″绾ч瀵�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String technicalDirectorLeader;
/**鎶�鏈富绠″绾ч瀵肩‘璁ゆ剰瑙�*/
@Excel(name = "鎶�鏈富绠″绾ч瀵肩‘璁ゆ剰瑙�", width = 15)
@@ -297,6 +305,7 @@
/**涓荤閮ㄧ骇棰嗗*/
@Excel(name = "涓荤閮ㄧ骇棰嗗", width = 15)
@ApiModelProperty(value = "涓荤閮ㄧ骇棰嗗")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String technicalDirectorPart;
/**涓荤閮ㄧ骇棰嗗纭鏃堕棿*/
@Excel(name = "涓荤閮ㄧ骇棰嗗纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
@@ -335,4 +344,9 @@
private String scrapPartValue;
/**鐢熶骇鍗曚綅*/
private String factoryName;
+ /**鏁呴殰寮�濮嬫椂闂�*/
+ @ApiModelProperty(name = "鏁呴殰寮�濮嬫椂闂�",notes = "")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date faultStartTime;
}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportAccidentsRegisterMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportAccidentsRegisterMapper.xml
index 65df024..f51acf0 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportAccidentsRegisterMapper.xml
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportAccidentsRegisterMapper.xml
@@ -31,6 +31,7 @@
wmo.scrap_part_number,
wmo.scrap_part_quantity,
wmo.scrap_part_value ,
+ wmo.fault_start_time,
f.factory_name
FROM eam_report_accidents_register aar
LEFT JOIN eam_report_repair wmo
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamRepairOrderService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamRepairOrderService.java
index 604c72c..727aa23 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamRepairOrderService.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamRepairOrderService.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import liquibase.pro.packaged.S;
import org.jeecg.modules.eam.dto.EamRepairOrderDto;
import org.jeecg.modules.eam.dto.EamRepairOrderExport;
import org.jeecg.modules.eam.entity.EamEquipment;
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index 21de29a..b25006b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -191,6 +191,7 @@
eamRepairOrderDtoList.add(eamRepairOrderDto);
});
}
+
return eamRepairOrderDtoList;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardDetailServiceImpl.java
index 9e74d97..924db6c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardDetailServiceImpl.java
@@ -1,7 +1,6 @@
package org.jeecg.modules.eam.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import liquibase.pro.packaged.Q;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.mapper.EamMaintenanceStandardDetailMapper;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
index e32fe77..17fff29 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
@@ -9,7 +9,6 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import liquibase.pro.packaged.Q;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
--
Gitblit v1.9.3