From 86ba6f759117d9437bcaab902efa29e8cf72c815 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 25 七月 2025 17:51:36 +0800
Subject: [PATCH] 设备故障登记
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java
index 3058d9f..0003f16 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java
@@ -129,6 +129,7 @@
if (StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getEquipmentName())) {
queryWrapper.like("e.equipment_name", eamReportAccidentsRegisterQuery.getEquipmentName());
}
+ queryWrapper.eq("aar.del_flag", CommonConstant.DEL_FLAG_0);
//鎺掑簭
if (StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getColumn()) && StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getOrder())) {
String column = eamReportAccidentsRegisterQuery.getColumn();
@@ -348,7 +349,7 @@
case PENDING_REPAIR_TEAM_LEADER:
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0013);
if (CollectionUtil.isEmpty(userSelectors)) {
- throw new JeecgBootException("璁惧鏈瓨鍦ㄧ淮淇粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒");
+ throw new JeecgBootException("璁惧鏈瓨鍦ㄧ淮淇尯闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒");
}
userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("NextAssignee", userApprovalList);
@@ -391,7 +392,7 @@
//缁翠慨鍖洪暱鎷掔粷
eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
}else {
- eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_REPAIR_REGIONAL_MANAGER.name());
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_TECHNICAL_RESPONSIBLE.name());
}
break;
//寰呮妧鏈礋璐ｄ汉澶勭悊
@@ -471,13 +472,13 @@
throw new JeecgBootException("瀹℃壒澶辫触");
}
eamReportAccidentsRegisterDto.setValues(values);
+ //淇濆瓨宸ュ崟
+ this.updateById(eamReportAccidentsRegister);
Result result = flowTaskService.complete(eamReportAccidentsRegisterDto);
if (!result.isSuccess()) {
throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
}
- //淇濆瓨宸ュ崟
- this.updateById(eamReportAccidentsRegister);
- return result;
+ return Result.ok("瀹℃壒鎴愬姛");
}
private boolean claimTask(String taskId, LoginUser user) {
--
Gitblit v1.9.3