From 96271372957a94cc290783aba40ad9c65f96e0b2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 17 七月 2025 14:19:13 +0800
Subject: [PATCH] 三保领取状态调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index cdf64aa..2ae822a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -171,7 +171,7 @@
order.setMaintenanceDate(request.getMaintenanceDate());
order.setRemark(request.getRemark());
//鐘舵�佸垵濮嬪寲
- order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
+ order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_CHECK.name());
order.setCreationMethod(request.getCreationMethod());
//鍒犻櫎鏍囪
order.setDelFlag(CommonConstant.DEL_FLAG_0);
@@ -251,7 +251,7 @@
if (entity == null) {
throw new JeecgBootException("瑕侀鍙栫殑宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
}
- if (!ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ if (!ThirdMaintenanceStatusEnum.WAIT_CHECK.name().equals(entity.getMaintenanceStatus())) {
throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囬鍙栵紒");
}
EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
@@ -375,7 +375,7 @@
values.put("dataId", order.getId());
values.put("organization", "鎶�鏈姸鎬侀壌瀹氱粨鏉�");
values.put("comment", "鎶�鏈姸鎬侀壌瀹氱粨鏉�");
- if (CommonConstant.YN_O.equals(request.getFullyFunctional()) && CommonConstant.YN_O.equals(request.getRunningNormally())) {
+ if (CommonConstant.YN_1.equals(request.getFullyFunctional()) && CommonConstant.YN_1.equals(request.getRunningNormally())) {
values.put("confirmation", "1");
// 鑾峰彇涓嬩竴姝ユ墽琛屼汉
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002);
@@ -384,12 +384,12 @@
}
userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("NextAssignee", userApprovalList);
- request.setComment("妫�鏌ヤ汉妫�鏌ョ粨鏉�");
//鏇存柊璁惧淇濆吇鐘舵��
eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_THIRD_MAINTENANCE.name());
} else {
values.put("confirmation", "2");
}
+ request.setComment("妫�鏌ヤ汉妫�鏌ョ粨鏉�");
break;
case UNDER_MAINTENANCE:
// 淇濆吇缁撴潫
@@ -519,10 +519,10 @@
case WAIT_CHECK:
// 鎶�鏈姸鎬侀壌瀹氱粨鏉�
order.setInspector(user.getUsername());
- order.setFullyFunctional(request.getFullyFunctionalResult());
- order.setRunningNormally(request.getRunningNormallyResult());
+ order.setFullyFunctional(request.getFullyFunctional());
+ order.setRunningNormally(request.getRunningNormally());
order.setInspectTime(new Date());
- if (CommonConstant.YN_O.equals(request.getFullyFunctionalResult()) && CommonConstant.YN_O.equals(request.getRunningNormallyResult())) {
+ if (CommonConstant.YN_1.equals(request.getFullyFunctional()) && CommonConstant.YN_1.equals(request.getRunningNormally())) {
// 閴村畾閫氳繃
order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
} else {
--
Gitblit v1.9.3