From 4a5e8881171f2e89fcb0dde381b17750a85b924f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 25 七月 2025 10:34:22 +0800
Subject: [PATCH] 维修工单更改
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 4 ++--
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java | 8 ++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderDto.java | 13 +++++++++++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EamRepairOrderRepairStatusEnum.java | 3 ++-
4 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EamRepairOrderRepairStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EamRepairOrderRepairStatusEnum.java
index 2b37eb6..cdd823d 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EamRepairOrderRepairStatusEnum.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/EamRepairOrderRepairStatusEnum.java
@@ -4,5 +4,6 @@
PENDING_REPAIR,
UNDER_MAINTENANCE,
PENDING_CONFIRMATION,
- REPAIR_COMPLETED;
+ REPAIR_COMPLETED,
+ REJECTED;
}
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 07c7beb..c602432 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
@@ -43,6 +43,19 @@
private Integer delFlag;
/**宸ュ崟缂栧彿*/
private String repairCode;
+ /**鏁呴殰绫诲瀷*/
+ @Excel(name = "鏁呴殰绫诲瀷", width = 15)
+ @ApiModelProperty(value = "鏁呴殰绫诲瀷")
+ @Dict(dicCode = "fault_type")
+ private String faultType;
+ /**鏁呴殰鐜拌薄*/
+ @Excel(name = "鏁呴殰鐜拌薄", width = 15)
+ @ApiModelProperty(value = "鏁呴殰鐜拌薄")
+ private String faultPhenomenon;
+ /**鎶ヤ慨浜�*/
+ @Excel(name = "鎶ヤ慨浜�", width = 15)
+ @ApiModelProperty(value = "鎶ヤ慨浜�")
+ private String reportPerson;
/**鎶ヤ慨ID*/
private String reportId;
/**璁惧ID*/
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
index e783ef1..c84f71a 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
@@ -81,6 +81,14 @@
@ApiModelProperty(value = "鏁呴殰绫诲瀷")
@Dict(dicCode = "fault_type")
private String faultType;
+ /**鏁呴殰鐜拌薄*/
+ @Excel(name = "鏁呴殰鐜拌薄", width = 15)
+ @ApiModelProperty(value = "鏁呴殰鐜拌薄")
+ private String faultPhenomenon;
+ /**鎶ヤ慨浜�*/
+ @Excel(name = "鎶ヤ慨浜�", width = 15)
+ @ApiModelProperty(value = "鎶ヤ慨浜�")
+ private String reportPerson;
/** 缁翠慨寮�濮嬫椂闂� */
@ApiModelProperty(name = "缁翠慨寮�濮嬫椂闂�",notes = "")
private Date actualStartTime;
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 d6ab450..15ca1f2 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
@@ -347,7 +347,7 @@
if ("1".equals(request.getConfirmResult())) {
order.setRepairStatus(EamRepairOrderRepairStatusEnum.REPAIR_COMPLETED.name());
}else {
- order.setRepairStatus(EamRepairOrderRepairStatusEnum.UNDER_MAINTENANCE.name());
+ order.setRepairStatus(EamRepairOrderRepairStatusEnum.REJECTED.name());
}
}
order.setConfirmer(user.getUsername());
@@ -356,7 +356,7 @@
order.setConfirmComment(request.getConfirmComment());
this.baseMapper.updateById(order);
EamReportRepair eamReportRepair=eamReportRepairService.getById(order.getReportId());
- eamReportRepair.setReportStatus(EamRepairOrderRepairStatusEnum.UNDER_MAINTENANCE.name());
+ eamReportRepair.setReportStatus(order.getRepairStatus());
eamReportRepairService.updateById(eamReportRepair);
return order;
}
--
Gitblit v1.9.3