From 42c6702c415ad4e2d6bbd07545820bf98292111e Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 15 七月 2025 20:33:18 +0800
Subject: [PATCH] art: 技术状态鉴定工单-流程问题修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java | 199 ++++++++++++++++++++++++++-----------------------
1 files changed, 105 insertions(+), 94 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
index f64b5b6..1aa49f8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
@@ -4,11 +4,11 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import liquibase.pro.packaged.E;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
@@ -158,7 +158,7 @@
if (standard == null) {
throw new JeecgBootException("鎶�鏈姸鎬侀壌瀹氳鑼冧笉瀛樺湪锛屾坊鍔犲け璐ワ紒");
}
- if (!TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(standard.getStandardStatus())) {
+ if (!TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name().equals(standard.getStandardStatus())) {
throw new JeecgBootException("鎶�鏈姸鎬侀壌瀹氳鑼冩湭鍚敤锛屾坊鍔犲け璐ワ紒");
}
List<EamTechnicalStatusEvaluationStandardDetail> standardDetailList = standardDetailService.queryList(standard.getId());
@@ -331,6 +331,9 @@
List<UserSelector> userSelectors;
switch (status) {
case UNDER_EVALUATION:
+ if(CollectionUtil.isEmpty(request.getTableDetailList())) {
+ throw new JeecgBootException("妫�鏌ユ槑缁嗕俊鎭负绌猴紒");
+ }
boolean parallelCompletion = flowTaskService.checkParallelCompletion(flowMyBusiness.getTaskId());
//鎵ц瀹屾垚
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0008);
@@ -343,7 +346,10 @@
values.put("comment", "鎶�鏈姸鎬侀壌瀹氭墽琛岀粨鏉�");
request.setComment("鎶�鏈姸鎬侀壌瀹氭墽琛岀粨鏉�");
//璁剧疆entity
- if (parallelCompletion) {
+ if (CommonConstant.STATUS_1.equals(entity.getSafetyCheckCompleted())
+ && CommonConstant.STATUS_1.equals(entity.getPrecisionCheckCompleted())
+ && CommonConstant.STATUS_1.equals(entity.getOtherCheckCompleted())
+ && parallelCompletion) {
//澶氫釜浠诲姟閮藉凡瀹屾垚涓旂淮淇涓讳换閮藉凡瀹℃壒閫氳繃,浼氱瀹屾垚锛岃繘琛岀淮淇伐绛惧瓧
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002);
userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
@@ -353,102 +359,93 @@
}
if ("safety_equipment_check".equals(flowMyBusiness.getTaskNameId())) {
//鎵ц瀹夊叏妫�鏌�
- if (CommonConstant.STATUS_1.equals(entity.getSafetyCheckCompleted())) {
- values.put("safetyEquipmentCheckFlag", request.getSafetyCheckConfirmResult());
- entity.setSafetyCheckConfirmResult(request.getSafetyCheckConfirmResult());
- entity.setSafetyCheckConfirm(user.getUsername());
- entity.setSafetyCheckConfirmTime(new Date());
- entity.setSafetyCheckConfirmComment(request.getSafetyCheckConfirmComment());
- //缁翠慨瀹や富浠诲鎵�
- if (!CommonConstant.STATUS_1.equals(request.getSafetyCheckConfirmResult())) {
- //椹冲洖 缁欑洃瀵熶汉
- userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
- values.put("NextAssignee", userApprovalList);
- entity.setSafetyCheckCompleted(CommonConstant.STATUS_0);
- }
- } else {
- //瀹夊叏瑁呯疆妫�鏌ョ粨鏋滃～鎶�
- List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
- if(CollectionUtil.isEmpty(collect)) {
- throw new JeecgBootException("瀹夊叏瑁呯疆妫�鏌ラ」鏄庣粏涓虹┖锛�");
- }
- //缁撴灉椤规鏌�
- checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK);
- //娣诲姞鎿嶄綔浜轰俊鎭�
- for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
- detail.setRepairmanSignature(user.getUsername());
- detail.setRepairmanSignatureTime(new Date());
- }
- orderDetailService.updateBatchById(collect);
+ //瀹夊叏瑁呯疆妫�鏌ョ粨鏋滃～鎶�
+ List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
+ if (CollectionUtil.isEmpty(collect)) {
+ throw new JeecgBootException("瀹夊叏瑁呯疆妫�鏌ラ」鏄庣粏涓虹┖锛�");
+ }
+ //缁撴灉椤规鏌�
+ checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK);
+ //娣诲姞鎿嶄綔浜轰俊鎭�
+ for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
+ detail.setRepairmanSignature(user.getUsername());
+ detail.setRepairmanSignatureTime(new Date());
+ }
+ orderDetailService.updateBatchById(collect);
+ values.put("NextAssignee", userApprovalList);
+ entity.setSafetyCheckCompleted(CommonConstant.STATUS_1);
+ } else if ("safety_equipment_check_confirm".equals(flowMyBusiness.getTaskNameId()) && CommonConstant.STATUS_1.equals(entity.getSafetyCheckCompleted())) {
+ values.put("safetyEquipmentCheckFlag", request.getSafetyCheckConfirmResult());
+ entity.setSafetyCheckConfirmResult(request.getSafetyCheckConfirmResult());
+ entity.setSafetyCheckConfirm(user.getUsername());
+ entity.setSafetyCheckConfirmTime(new Date());
+ entity.setSafetyCheckConfirmComment(request.getSafetyCheckConfirmComment());
+ //缁翠慨瀹や富浠诲鎵�
+ if (!CommonConstant.STATUS_1.equals(request.getSafetyCheckConfirmResult())) {
+ //椹冲洖 缁欑洃瀵熶汉
+ userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
values.put("NextAssignee", userApprovalList);
- entity.setSafetyCheckCompleted(CommonConstant.STATUS_1);
+ entity.setSafetyCheckCompleted(CommonConstant.STATUS_0);
}
} else if ("equipment_precision_check".equals(flowMyBusiness.getTaskNameId())) {
//澶勭悊绮惧害妫�楠�
- if (CommonConstant.STATUS_1.equals(entity.getPrecisionCheckCompleted())) {
- values.put("precisionCheckFlag", request.getPrecisionCheckConfirmResult());
- entity.setPrecisionCheckConfirmResult(request.getPrecisionCheckConfirmResult());
- entity.setPrecisionCheckConfirm(user.getUsername());
- entity.setPrecisionCheckConfirmTime(new Date());
- entity.setPrecisionCheckConfirmComment(request.getPrecisionCheckConfirmComment());
- //缁翠慨瀹や富浠诲鎵�
- if (!CommonConstant.STATUS_1.equals(request.getPrecisionCheckConfirmResult())) {
- //椹冲洖 缁欑洃瀵熶汉
- userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
- values.put("NextAssignee", userApprovalList);
- entity.setPrecisionCheckCompleted(CommonConstant.STATUS_0);
- }
- } else {
- //璁惧绮惧害妫�鏌ョ粨鏋滃～鎶�
- List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
- if(CollectionUtil.isEmpty(collect)) {
- throw new JeecgBootException("璁惧绮惧害妫�鏌ラ」鏄庣粏涓虹┖锛�");
- }
- //缁撴灉椤规鏌�
- checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK);
- //娣诲姞鎿嶄綔浜轰俊鎭�
- for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
- detail.setRepairmanSignature(user.getUsername());
- detail.setRepairmanSignatureTime(new Date());
- }
- orderDetailService.updateBatchById(collect);
- values.put("NextAssignee", userApprovalList);
- entity.setPrecisionCheckCompleted(CommonConstant.STATUS_1);
+ //璁惧绮惧害妫�鏌ョ粨鏋滃～鎶�
+ List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
+ if (CollectionUtil.isEmpty(collect)) {
+ throw new JeecgBootException("璁惧绮惧害妫�鏌ラ」鏄庣粏涓虹┖锛�");
}
-
+ //缁撴灉椤规鏌�
+ checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK);
+ //娣诲姞鎿嶄綔浜轰俊鎭�
+ for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
+ detail.setRepairmanSignature(user.getUsername());
+ detail.setRepairmanSignatureTime(new Date());
+ }
+ orderDetailService.updateBatchById(collect);
+ values.put("NextAssignee", userApprovalList);
+ entity.setPrecisionCheckCompleted(CommonConstant.STATUS_1);
+ } else if ("equipment_precision_check_confirm".equals(flowMyBusiness.getTaskNameId()) && CommonConstant.STATUS_1.equals(entity.getPrecisionCheckCompleted())) {
+ values.put("precisionCheckFlag", request.getPrecisionCheckConfirmResult());
+ entity.setPrecisionCheckConfirmResult(request.getPrecisionCheckConfirmResult());
+ entity.setPrecisionCheckConfirm(user.getUsername());
+ entity.setPrecisionCheckConfirmTime(new Date());
+ entity.setPrecisionCheckConfirmComment(request.getPrecisionCheckConfirmComment());
+ //缁翠慨瀹や富浠诲鎵�
+ if (!CommonConstant.STATUS_1.equals(request.getPrecisionCheckConfirmResult())) {
+ //椹冲洖 缁欑洃瀵熶汉
+ userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
+ values.put("NextAssignee", userApprovalList);
+ entity.setPrecisionCheckCompleted(CommonConstant.STATUS_0);
+ }
} else if ("other_check".equals(flowMyBusiness.getTaskNameId())) {
//澶勭悊鍏朵粬妫�鏌�
- if (CommonConstant.STATUS_1.equals(entity.getOtherCheckCompleted())) {
- values.put("otherCheckFlag", request.getOtherCheckResult());
- entity.setOtherCheckResult(request.getOtherCheckConfirmResult());
- entity.setOtherCheckConfirm(user.getUsername());
- entity.setOtherCheckConfirmTime(new Date());
- entity.setOtherCheckConfirmComment(request.getOtherCheckConfirmComment());
- //缁翠慨瀹や富浠诲鎵�
- if (!CommonConstant.STATUS_1.equals(request.getOtherCheckConfirmResult())) {
- //椹冲洖 缁欑洃瀵熶汉
- userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
- values.put("NextAssignee", userApprovalList);
- entity.setOtherCheckCompleted(CommonConstant.STATUS_0);
- }
- } else {
- //鍏朵粬妫�鏌ョ粨鏋滃～鎶�
- List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
- if(CollectionUtil.isEmpty(collect)) {
- throw new JeecgBootException("鍏朵粬妫�鏌ラ」鏄庣粏涓虹┖锛�");
- }
- //缁撴灉椤规鏌�
- checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK);
- //娣诲姞鎿嶄綔浜轰俊鎭�
- for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
- detail.setRepairmanSignature(user.getUsername());
- detail.setRepairmanSignatureTime(new Date());
- }
- orderDetailService.updateBatchById(collect);
+ //鍏朵粬妫�鏌ョ粨鏋滃～鎶�
+ List<EamTechnicalStatusEvaluationOrderDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList());
+ if (CollectionUtil.isEmpty(collect)) {
+ throw new JeecgBootException("鍏朵粬妫�鏌ラ」鏄庣粏涓虹┖锛�");
+ }
+ //缁撴灉椤规鏌�
+ checkDetailResult(request.getTableDetailList(), TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK);
+ //娣诲姞鎿嶄綔浜轰俊鎭�
+ for (EamTechnicalStatusEvaluationOrderDetail detail : collect) {
+ detail.setRepairmanSignature(user.getUsername());
+ detail.setRepairmanSignatureTime(new Date());
+ }
+ orderDetailService.updateBatchById(collect);
+ values.put("NextAssignee", userApprovalList);
+ entity.setOtherCheckCompleted(CommonConstant.STATUS_1);
+ } else if ("other_check_confirm".equals(flowMyBusiness.getTaskNameId()) && CommonConstant.STATUS_1.equals(entity.getOtherCheckCompleted())) {
+ values.put("otherCheckFlag", request.getOtherCheckConfirmResult());
+ entity.setOtherCheckConfirmResult(request.getOtherCheckConfirmResult());
+ entity.setOtherCheckConfirm(user.getUsername());
+ entity.setOtherCheckConfirmTime(new Date());
+ entity.setOtherCheckConfirmComment(request.getOtherCheckConfirmComment());
+ //缁翠慨瀹や富浠诲鎵�
+ if (!CommonConstant.STATUS_1.equals(request.getOtherCheckConfirmResult())) {
+ //椹冲洖 缁欑洃瀵熶汉
+ userApprovalList = Collections.singletonList(request.getTableDetailList().get(0).getRepairmanSignature());
values.put("NextAssignee", userApprovalList);
- entity.setPrecisionCheckCompleted(CommonConstant.STATUS_1);
- values.put("NextAssignee", userApprovalList);
- entity.setOtherCheckCompleted(CommonConstant.STATUS_1);
+ entity.setOtherCheckCompleted(CommonConstant.STATUS_0);
}
}
break;
@@ -488,6 +485,7 @@
entity.setRepairManagerSignature(user.getUsername());
entity.setRepairManagerSignatureTime(new Date());
entity.setRepairManagerComment(request.getRepairManagerComment());
+ entity.setRepairManagerSignatureResult(request.getRepairManagerSignatureResult());
//璁剧疆entity
if (BusinessCodeConst.APPROVED.equals(request.getRepairManagerSignatureResult())) {
values.put("NextAssignee", userApprovalList);
@@ -534,6 +532,7 @@
entity.setDepartTechnicalLeaderSignature(user.getUsername());
entity.setDepartTechnicalLeaderSignatureTime(new Date());
entity.setDepartTechnicalLeaderComment(request.getDepartTechnicalLeaderComment());
+ entity.setDepartTechnicalLeaderSignatureResult(request.getDepartTechnicalLeaderSignatureResult());
//璁剧疆entity
if (BusinessCodeConst.APPROVED.equals(request.getDepartTechnicalLeaderSignatureResult())) {
values.put("NextAssignee", userApprovalList);
@@ -571,24 +570,36 @@
return entity;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateEvaluationStatus(String orderId, String evaluationStatus) {
+ UpdateWrapper<EamTechnicalStatusEvaluationOrder> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("order_id", orderId);
+ updateWrapper.set("evaluation_status", evaluationStatus);
+ updateWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+ updateWrapper.eq("evaluation_status", TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name());
+ int update = this.getBaseMapper().update(null, updateWrapper);
+ return update > 0;
+ }
+
private void checkDetailResult(List<EamTechnicalStatusEvaluationOrderDetail> detailList, TechnicalStatusEvaluationCheckCategoryEnum checkCategory) {
boolean b;
switch (checkCategory) {
case SAFETY_EQUIPMENT_CHECK:
b = detailList.stream().allMatch(item -> StringUtils.isNotBlank(item.getSafetyEquipmentCheckResult()));
- if(!b) {
+ if (!b) {
throw new JeecgBootException("鏈夊畨鍏ㄨ缃鏌ョ粨鏋滄湭濉啓锛�");
}
break;
case PRECISION_CHECK:
b = detailList.stream().allMatch(item -> item.getPrecisionCheckResult() != null);
- if(!b) {
+ if (!b) {
throw new JeecgBootException("鏈夎澶囩簿搴︽鏌ョ粨鏋滄湭濉啓锛�");
}
break;
case OTHER_CHECK:
b = detailList.stream().allMatch(item -> StringUtils.isNotBlank(item.getOtherCheckResult()));
- if(!b) {
+ if (!b) {
throw new JeecgBootException("鏈夊叾浠栨鏌ョ粨鏋滄湭濉啓锛�");
}
break;
--
Gitblit v1.9.3