From e5a85d904ce028a35229ab6245ab894afbca6531 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 26 七月 2025 17:07:30 +0800
Subject: [PATCH] 维修工单
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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..02af5d5 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,10 @@
if (StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getEquipmentName())) {
queryWrapper.like("e.equipment_name", eamReportAccidentsRegisterQuery.getEquipmentName());
}
+ if (StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getRegisterStatus())) {
+ queryWrapper.eq("aar.register_status", eamReportAccidentsRegisterQuery.getRegisterStatus());
+ }
+ queryWrapper.eq("aar.del_flag", CommonConstant.DEL_FLAG_0);
//鎺掑簭
if (StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getColumn()) && StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getOrder())) {
String column = eamReportAccidentsRegisterQuery.getColumn();
@@ -222,7 +226,7 @@
public Result<?> audit(EamReportAccidentsRegisterDto eamReportAccidentsRegisterDto){
EamReportAccidentsRegister eamReportAccidentsRegister = this.baseMapper.selectById(eamReportAccidentsRegisterDto.getId());
if (eamReportAccidentsRegister == null) {
- throw new JeecgBootException("缁翠慨宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ throw new JeecgBootException("宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
}
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -270,6 +274,7 @@
}
values.put("organization",eamReportAccidentsRegisterDto.getDistrictConfirm());
values.put("comment", eamReportAccidentsRegisterDto.getDistrictConfirm());
+ values.put("districtResult", eamReportAccidentsRegisterDto.getDistrictResult());
eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getDistrictConfirm());
eamReportAccidentsRegister.setDistrict(user.getUsername());
eamReportAccidentsRegister.setDistrictTime(new Date());
@@ -297,6 +302,7 @@
}
values.put("organization",eamReportAccidentsRegisterDto.getCenterDirectorConfirm());
values.put("comment", eamReportAccidentsRegisterDto.getCenterDirectorConfirm());
+ values.put("centerDirectorResult", eamReportAccidentsRegisterDto.getCenterDirectorResult());
eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getCenterDirectorConfirm());
eamReportAccidentsRegister.setCenterDirector(user.getUsername());
eamReportAccidentsRegister.setCenterDirectorTime(new Date());
@@ -324,6 +330,7 @@
}
values.put("organization",eamReportAccidentsRegisterDto.getRepairConfirmComment());
values.put("comment", eamReportAccidentsRegisterDto.getRepairConfirmComment());
+ values.put("repairConfirmResult", eamReportAccidentsRegisterDto.getRepairConfirmResult());
eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getRepairConfirmComment());
eamReportAccidentsRegister.setRepairConfirm(user.getUsername());
eamReportAccidentsRegister.setRepairConfirmTime(new Date());
@@ -337,7 +344,7 @@
eamReportAccidentsRegister.setSuggestionTakeSteps(eamReportAccidentsRegisterDto.getSuggestionTakeSteps());
eamReportAccidentsRegister.setSuggestionTakeStepsTime(eamReportAccidentsRegisterDto.getSuggestionTakeStepsTime());
if ("2".equals(eamReportAccidentsRegisterDto.getRepairConfirmResult())){
- //缁翠慨缁勯暱鎷掔粷
+ //缁翠慨宸ユ嫆缁�
eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
}else {
eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_REPAIR_TEAM_LEADER.name());
@@ -348,7 +355,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);
@@ -357,6 +364,7 @@
}
values.put("organization",eamReportAccidentsRegisterDto.getRepairGroupLeaderComment());
values.put("comment", eamReportAccidentsRegisterDto.getRepairGroupLeaderComment());
+ values.put("repairGroupLeaderResult", eamReportAccidentsRegisterDto.getRepairGroupLeaderResult());
eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getRepairGroupLeaderComment());
eamReportAccidentsRegister.setRepairGroupLeader(user.getUsername());
eamReportAccidentsRegister.setRepairGroupLeaderTime(new Date());
@@ -382,16 +390,17 @@
}
values.put("organization",eamReportAccidentsRegisterDto.getRepairDistrictComment());
values.put("comment", eamReportAccidentsRegisterDto.getRepairDistrictComment());
+ values.put("repairDistrictResult", eamReportAccidentsRegisterDto.getRepairDistrictResult());
eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getRepairDistrictComment());
eamReportAccidentsRegister.setRepairDistrict(user.getUsername());
eamReportAccidentsRegister.setRepairDistrictTime(new Date());
eamReportAccidentsRegister.setRepairDistrictResult(eamReportAccidentsRegisterDto.getRepairDistrictResult());
eamReportAccidentsRegister.setRepairDistrictComment(eamReportAccidentsRegisterDto.getRepairDistrictComment());
- if ("2".equals(eamReportAccidentsRegisterDto.getCenterDirectorResult())){
+ if ("2".equals(eamReportAccidentsRegisterDto.getRepairDistrictResult())){
//缁翠慨鍖洪暱鎷掔粷
eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
}else {
- eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_REPAIR_REGIONAL_MANAGER.name());
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_TECHNICAL_RESPONSIBLE.name());
}
break;
//寰呮妧鏈礋璐ｄ汉澶勭悊
@@ -407,6 +416,7 @@
}
values.put("organization",eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm());
values.put("comment", eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm());
+ values.put("technicalDirectorResult", eamReportAccidentsRegisterDto.getTechnicalDirectorResult());
eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm());
eamReportAccidentsRegister.setCheckAgree(eamReportAccidentsRegisterDto.getCheckAgree());
eamReportAccidentsRegister.setDisagreeReason(eamReportAccidentsRegisterDto.getDisagreeReason());
@@ -416,7 +426,7 @@
eamReportAccidentsRegister.setTechnicalDirectorTime(new Date());
eamReportAccidentsRegister.setTechnicalDirectorResult(eamReportAccidentsRegisterDto.getTechnicalDirectorResult());
eamReportAccidentsRegister.setTechnicalDirectorConfirm(eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm());
- if ("2".equals(eamReportAccidentsRegisterDto.getCenterDirectorResult())){
+ if ("2".equals(eamReportAccidentsRegisterDto.getTechnicalDirectorResult())){
//鎶�鏈礋璐ｄ汉鎷掔粷
eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
}else {
@@ -436,12 +446,13 @@
}
values.put("organization",eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderConfirm());
values.put("comment", eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderConfirm());
+ values.put("technicalDirectorLeaderResult", eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderResult());
eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderConfirm());
eamReportAccidentsRegister.setTechnicalDirectorLeader(user.getUsername());
eamReportAccidentsRegister.setTechnicalDirectorLeaderTime(new Date());
eamReportAccidentsRegister.setTechnicalDirectorLeaderResult(eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderResult());
eamReportAccidentsRegister.setTechnicalDirectorLeaderConfirm(eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderConfirm());
- if ("2".equals(eamReportAccidentsRegisterDto.getCenterDirectorResult())){
+ if ("2".equals(eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderResult())){
//鎶�鏈富绠″绾ч瀵兼嫆缁�
eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
}else {
@@ -455,12 +466,13 @@
}
values.put("organization",eamReportAccidentsRegisterDto.getTechnicalDirectorPartConfirm());
values.put("comment", eamReportAccidentsRegisterDto.getTechnicalDirectorPartConfirm());
+ values.put("technicalDirectorPartResult", eamReportAccidentsRegisterDto.getTechnicalDirectorPartResult());
eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getTechnicalDirectorPartConfirm());
eamReportAccidentsRegister.setTechnicalDirectorPart(user.getUsername());
eamReportAccidentsRegister.setTechnicalDirectorPartTime(new Date());
eamReportAccidentsRegister.setTechnicalDirectorPartResult(eamReportAccidentsRegisterDto.getTechnicalDirectorPartResult());
eamReportAccidentsRegister.setTechnicalDirectorPartConfirm(eamReportAccidentsRegisterDto.getTechnicalDirectorPartConfirm());
- if ("2".equals(eamReportAccidentsRegisterDto.getCenterDirectorResult())){
+ if ("2".equals(eamReportAccidentsRegisterDto.getTechnicalDirectorPartResult())){
//鎶�鏈富绠″绾ч瀵兼嫆缁�
eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
}else {
@@ -471,13 +483,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