From 1abce23735329232067d2338755b27ba1599aa2f Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 21 四月 2025 16:17:37 +0800
Subject: [PATCH] 维修流程处理
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java | 4 ++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java | 10 ++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 4 ++++
3 files changed, 18 insertions(+), 0 deletions(-)
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 9d50b04..ac5d95a 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
@@ -71,6 +71,16 @@
@ApiModelProperty(value = "缁翠慨缁撴潫鏃堕棿")
private Date actualEndTime;
/**
+ * 鏄惁棰嗙敤澶囦欢 1锛氭槸 0锛氬惁
+ */
+ @ApiModelProperty(value = "鏄惁棰嗙敤澶囦欢")
+ private Integer isUseSpare;
+ /**
+ * 澶囦欢鎻忚堪
+ */
+ @ApiModelProperty(value = "澶囦欢鎻忚堪")
+ private String sparePartDescription;
+ /**
* 鏁呴殰鍘熷洜
*/
@Excel(name = "鏁呴殰鍘熷洜", width = 15)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java
index 957b2ec..1f01bbb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderRequest.java
@@ -64,4 +64,8 @@
/**缁翠慨鍥剧墖*/
@ApiModelProperty(value = "缁翠慨鍥剧墖闆嗗悎")
private List<FileUploadResult> imageFilesResult;
+
+ /**澶囦欢鎻忚堪*/
+ @ApiModelProperty(value = "澶囦欢鎻忚堪")
+ private String sparePartDescription;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index f0cefb9..25b1f01 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -119,6 +119,7 @@
eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId());
eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
eamRepairOrder.setActualStartTime(DateUtils.getNow());
+ eamRepairOrder.setIsUseSpare(0);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
eamRepairOrder.setRepairer(user.getRealname());
super.save(eamRepairOrder);
@@ -208,6 +209,7 @@
values.put("status", 1);
request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());
+ eamRepairOrder.setIsUseSpare(1);
} else {
// 涓嶉渶瑕�
EamReportRepair eamReportRepair = eamReportRepairService.getById(eamRepairOrder.getReportId());
@@ -220,6 +222,7 @@
eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_CONFIRM.name());
eamRepairOrder.setFaultReason(request.getFaultReason());
eamRepairOrder.setRepairDescription(request.getRepairDescription());
+ eamRepairOrder.setIsUseSpare(0);
// 澶勭悊闄勪欢
if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
@@ -244,6 +247,7 @@
values.put("status", 0);
request.setComment("缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
+ eamRepairOrder.setSparePartDescription(request.getSparePartDescription());
break;
case WAIT_CONFIRM:
// 寰呯‘璁�, 缁翠慨鍛樼淮淇畬鎴愶紝鎶ヤ慨浜虹‘璁ょ粨鏉熸祦绋�
--
Gitblit v1.9.3