From 7bf56c8ec3f257b28b40c1c22eb0ec0fd8d8024d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 16 四月 2025 17:28:39 +0800
Subject: [PATCH] 增加强制结束流程
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index b5396f5..8eb1d69 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -367,6 +367,9 @@
}
break;
case WAIT_CONFIRM:
+ if(StringUtils.isBlank(equipment.getEquipmentManager())) {
+ throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
//鐝粍闀跨‘璁�
userApprovalList = new ArrayList<>();
userApprovalList.add(equipment.getEquipmentManager());
@@ -381,6 +384,7 @@
entity.setConfirmUser(user.getUsername());
entity.setConfirmComment(request.getConfirmComment());
entity.setConfirmTime(new Date());
+ entity.setConfirmDealType(request.getConfirmDealType());
if (CommonConstant.HAS_CANCLE.equals(request.getConfirmDealType())) {
//椹冲洖
userApprovalList = new ArrayList<>();
@@ -397,7 +401,7 @@
case WAIT_INITIAL_ACCEPTANCE:
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0005);
if (CollectionUtil.isEmpty(userSelectors)) {
- throw new JeecgBootException("璁惧鏈垎閰嶇粰鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰璁捐兘閮ㄧ鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
}
userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("dataId", entity.getId());
--
Gitblit v1.9.3