From 99d6db0aab044b740ce02f57872c1e38ae647b58 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 19:00:50 +0800
Subject: [PATCH] 三不原则分析 中心修改 台账导入导出字段修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 13 +++++++++++++
1 files changed, 13 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..8faaf0a 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);
});
@@ -429,6 +430,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 +443,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 +463,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