From 55dd051531a6fc6190f3c67f20c930822d8e3d9d Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期三, 16 七月 2025 20:45:29 +0800 Subject: [PATCH] 三保流程修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 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 9896775..61356aa 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 @@ -375,7 +375,7 @@ values.put("dataId", order.getId()); values.put("organization", "鎶�鏈姸鎬侀壌瀹氱粨鏉�"); values.put("comment", "鎶�鏈姸鎬侀壌瀹氱粨鏉�"); - if (CommonConstant.YN_O.equals(request.getFullyFunctionalResult()) && CommonConstant.YN_O.equals(request.getRunningNormallyResult())) { + if (CommonConstant.YN_1.equals(request.getFullyFunctionalResult()) && CommonConstant.YN_1.equals(request.getRunningNormallyResult())) { 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: // 淇濆吇缁撴潫 @@ -522,7 +522,7 @@ order.setFullyFunctional(request.getFullyFunctionalResult()); order.setRunningNormally(request.getRunningNormallyResult()); order.setInspectTime(new Date()); - if (CommonConstant.YN_O.equals(request.getFullyFunctionalResult()) && CommonConstant.YN_O.equals(request.getRunningNormallyResult())) { + if (CommonConstant.YN_1.equals(request.getFullyFunctionalResult()) && CommonConstant.YN_1.equals(request.getRunningNormallyResult())) { // 閴村畾閫氳繃 order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.UNDER_MAINTENANCE.name()); } else { -- Gitblit v1.9.3