From e5d0fe8cfdc5e171badfa22bac00b0e2e81ee6e6 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 07 六月 2025 16:17:59 +0800
Subject: [PATCH] art: 设备管理-设备维修-维修流程审批接口修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
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 ec788f6..a44565e 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
@@ -304,6 +304,7 @@
order.setRepairConfirmComment(request.getRepairConfirmComment());
order.setRepairConfirmTime(new Date());
values.put("dataId", order.getId());
+ values.put("repairConfirm", request.getRepairConfirm());
if(StringUtils.isNotBlank(request.getRepairConfirmComment())){
values.put("organization", request.getRepairConfirmComment());
values.put("comment", request.getRepairConfirmComment());
@@ -316,6 +317,7 @@
if(CommonConstant.STATUS_1.equals(request.getRepairConfirm())) {
//鍙唴閮ㄧ淮淇� 缁翠慨浜鸿繘琛岀淮淇�
values.put("NextAssignee", Arrays.asList(order.getRepairer().split(",")));
+
order.setRepairStatus(ReportRepairEnum.UNDER_INTERNAL_REPAIR.name());
eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_INTERNAL_REPAIR.name());
}else {
@@ -362,6 +364,7 @@
order.setLeaderUser(user.getUsername());
order.setLeaderConfirmTime(new Date());
values.put("dataId", order.getId());
+ values.put("leaderConfirm", request.getLeaderConfirm());
if(StringUtils.isNotBlank(request.getLeaderConfirmComment())){
values.put("organization", request.getLeaderConfirmComment());
values.put("comment", request.getLeaderConfirmComment());
@@ -372,11 +375,6 @@
request.setComment("缁翠慨宸ュ崟棰嗗纭瀹屾垚");
}
if(CommonConstant.STATUS_1.equals(request.getLeaderConfirm())) {
- //椹冲洖 鍙唴閮ㄧ淮淇� 缁翠慨浜鸿繘琛岀淮淇�
- values.put("NextAssignee", Arrays.asList(order.getRepairer().split(",")));
- order.setRepairStatus(ReportRepairEnum.UNDER_INTERNAL_REPAIR.name());
- eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_INTERNAL_REPAIR.name());
- }else {
//閫氳繃 鎻愪氦鏈哄姩鍔炵淮淇�
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0006);
if (CollectionUtil.isEmpty(userSelectors)) {
@@ -386,6 +384,11 @@
values.put("NextAssignee", userApprovalList);
order.setRepairStatus(ReportRepairEnum.WAIT_EXTERNAL_CONFIRM.name());
eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_EXTERNAL_CONFIRM.name());
+ }else {
+ //椹冲洖 鍙唴閮ㄧ淮淇� 缁翠慨浜鸿繘琛岀淮淇�
+ values.put("NextAssignee", Arrays.asList(order.getRepairer().split(",")));
+ order.setRepairStatus(ReportRepairEnum.UNDER_INTERNAL_REPAIR.name());
+ eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_INTERNAL_REPAIR.name());
}
break;
case WAIT_EXTERNAL_CONFIRM:
@@ -394,6 +397,7 @@
order.setExternalRepairer(user.getUsername());
order.setExternalConfirmTime(new Date());
values.put("dataId", order.getId());
+ values.put("externalConfirm", request.getExternalConfirm());
if(StringUtils.isNotBlank(request.getExternalConfirmComment())){
values.put("organization", request.getExternalConfirmComment());
values.put("comment", request.getExternalConfirmComment());
@@ -403,7 +407,7 @@
values.put("comment", "缁翠慨宸ュ崟鏈哄姩鍔炵‘璁ゅ畬鎴�");
request.setComment("缁翠慨宸ュ崟鏈哄姩鍔炵‘璁ゅ畬鎴�");
}
- if(CommonConstant.STATUS_1.equals(request.getLeaderConfirm())) {
+ if(CommonConstant.STATUS_1.equals(request.getExternalConfirm())) {
//鏈哄姩鍔炲彲缁翠慨 鏈哄姩鍔炵淮淇汉杩涜缁翠慨
values.put("NextAssignee", Arrays.asList(order.getExternalRepairer().split(",")));
order.setRepairStatus(ReportRepairEnum.UNDER_EXTERNAL_REPAIR.name());
--
Gitblit v1.9.3