From 0bc74278ff8130936bc7aed763e8901fedb4f3b0 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 01 八月 2025 11:44:49 +0800
Subject: [PATCH] 故障报修新增hf编码
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
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 b8cd1ce..a24b234 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
@@ -183,6 +183,7 @@
eamMaintenanceStandardDetailList.forEach(item -> {
EamSecondMaintenanceOrderDetail detail = new EamSecondMaintenanceOrderDetail();
BeanUtils.copyProperties(item, detail);
+ detail.setId(null);
detail.setOrderId(order.getId());
requestTableDetailList.add(detail);
});
@@ -391,6 +392,7 @@
EamSecondMaintenanceOrderDetail eamMaintenanceStandardDetail=new EamSecondMaintenanceOrderDetail();
BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
eamMaintenanceStandardDetail.setOrderId(entity.getId());
+ eamMaintenanceStandardDetail.setCreateBy(user.getUsername());
addList.add(eamMaintenanceStandardDetail);
});
secondMaintenanceOrderDetailService.saveBatch(addList);
@@ -413,6 +415,7 @@
EamSecondMaintenanceOrderDetail eamMaintenanceStandardDetail=new EamSecondMaintenanceOrderDetail();
BeanUtils.copyProperties(tableDetail, eamMaintenanceStandardDetail);
eamMaintenanceStandardDetail.setOrderId(entity.getId());
+ eamMaintenanceStandardDetail.setCreateBy(user.getUsername());
addList.add(eamMaintenanceStandardDetail);
});
secondMaintenanceOrderDetailService.saveBatch(addList);
@@ -429,6 +432,9 @@
userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("NextAssignee", userApprovalList);
values.put("dataId", entity.getId());
+ if (StrUtil.isEmpty(request.getDealDescription())){
+ request.setDealDescription("");
+ }
values.put("organization",request.getDealDescription());
values.put("comment", request.getDealDescription());
values.put("manageUserResult",request.getManageUserResult());
@@ -439,10 +445,16 @@
entity.setDealDescription(request.getDealDescription());
entity.setConfirmTime(new Date());
request.setComment(request.getDealDescription());
+ if (request.getManageUserResult().equals("2")){
+ entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.REJECTED.name());
+ }
}
break;
case WAIT_INSPECTOR_CONFIRM:
//妫�鏌ヤ汉纭
+ if (StrUtil.isEmpty(request.getDealDescription())){
+ request.setDealDescription("");
+ }
values.put("dataId", entity.getId());
values.put("organization",request.getInspectConfirmComment());
values.put("comment", request.getInspectConfirmComment());
@@ -453,6 +465,9 @@
entity.setInspectConfirmComment(request.getInspectConfirmComment());
entity.setInspectConfirmTime(new Date());
request.setComment(request.getDealDescription());
+ if (request.getInspectorResult().equals("2")){
+ entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.REJECTED.name());
+ }
break;
default:
throw new JeecgBootException("瀹℃壒澶辫触");
--
Gitblit v1.9.3