From e9a086a3b7c1c111c56025ca99b57ff560ca817d Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 21 七月 2025 15:34:56 +0800
Subject: [PATCH] art: 技术状态鉴定工单-重复校验
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java | 442 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 410 insertions(+), 32 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 7125c4e..1c68444 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,6 +4,7 @@
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;
@@ -17,14 +18,8 @@
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.constant.HfTemplateCategoryEnum;
-import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
-import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationOrderStatusEnum;
-import org.jeecg.modules.eam.entity.EamBaseHFCode;
-import org.jeecg.modules.eam.entity.EamEquipment;
-import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
-import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard;
+import org.jeecg.modules.eam.constant.*;
+import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderMapper;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
@@ -46,6 +41,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -70,6 +66,8 @@
private ISysBusinessCodeRuleService businessCodeRuleService;
@Autowired
private IEamTechnicalStatusEvaluationStandardService standardService;
+ @Autowired
+ private IEamTechnicalStatusEvaluationStandardDetailService standardDetailService;
@Autowired
private IEamBaseHFCodeService hfCodeService;
@Autowired
@@ -147,7 +145,6 @@
} else {
queryWrapper.orderByDesc("ems.create_time");
}
- queryWrapper.orderByDesc("ems.create_time");
return this.getBaseMapper().queryPageList(page, queryWrapper);
}
@@ -159,56 +156,62 @@
throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
}
EamTechnicalStatusEvaluationStandard standard = standardService.getById(request.getStandardId());
- if(standard == null) {
+ if (standard == null) {
throw new JeecgBootException("鎶�鏈姸鎬侀壌瀹氳鑼冧笉瀛樺湪锛屾坊鍔犲け璐ワ紒");
}
+ if (!TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name().equals(standard.getStandardStatus())) {
+ throw new JeecgBootException("鎶�鏈姸鎬侀壌瀹氳鑼冩湭鍚敤锛屾坊鍔犲け璐ワ紒");
+ }
+ List<EamTechnicalStatusEvaluationStandardDetail> standardDetailList = standardDetailService.queryList(standard.getId());
+ if (CollectionUtil.isEmpty(standardDetailList)) {
+ throw new JeecgBootException("鎶�鏈姸鎬侀壌瀹氳鑼冩鏌ラ」涓虹┖锛屾坊鍔犲け璐ワ紒");
+ }
+ EamTechnicalStatusEvaluationOrder unCompleted = checkDuplicate(request.getEquipmentId());
+ if(unCompleted != null) {
+ throw new JeecgBootException("璁惧宸插瓨鍦ㄦ湭瀹屾垚鐨勬妧鏈姸鎬侀壌瀹氬伐鍗曪紝鏃犳硶鍐嶆鏂板锛�");
+ }
EamTechnicalStatusEvaluationOrder order = new EamTechnicalStatusEvaluationOrder();
- order.setOrderNum(request.getOrderNum());
order.setEquipmentId(request.getEquipmentId());
order.setStandardId(request.getStandardId());
order.setEvaluationDate(request.getEvaluationDate());
+ order.setFreezeOrderDate(request.getFreezeOrderDate());
+ order.setOrderExpirationDate(request.getOrderExpirationDate());
order.setRemark(request.getRemark());
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_ORDER_CODE_RULE);
- request.setOrderNum(codeSeq);
- request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
+ order.setOrderNum(codeSeq);
+ order.setCreationMethod(request.getCreationMethod());
//鐘舵�佸垵濮嬪寲
order.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name());
- order.setCreationMethod(request.getCreationMethod());
//鍒犻櫎鏍囪
order.setDelFlag(CommonConstant.DEL_FLAG_0);
//鎶�鏈姸鎬侀壌瀹氳〃
EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION.name());
- if(eamBaseHFCode == null) {
+ if (eamBaseHFCode == null) {
throw new JeecgBootException("鏈厤缃妧鏈姸鎬侀壌瀹氳〃鐨凥F缂栫爜锛屾坊鍔犲け璐ワ紒");
}
order.setHfCodeA(eamBaseHFCode.getHfCode());
//鎶�鏈姸鎬侀壌瀹氬畨鍏ㄨ缃鏌ヨ〃
eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_SAFETY_CHECK.name());
- if(eamBaseHFCode == null) {
+ if (eamBaseHFCode == null) {
throw new JeecgBootException("鏈厤缃畨鍏ㄨ缃鏌ヨ〃鐨凥F缂栫爜锛屾坊鍔犲け璐ワ紒");
}
order.setHfCodeB(eamBaseHFCode.getHfCode());
//鎶�鏈姸鎬侀壌瀹氬叾浠栨鏌ヨ〃
eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_OTHER_CHECK.name());
- if(eamBaseHFCode == null) {
+ if (eamBaseHFCode == null) {
throw new JeecgBootException("鏈厤缃叾浠栨鏌ヨ〃鐨凥F缂栫爜锛屾坊鍔犲け璐ワ紒");
}
order.setHfCodeD(eamBaseHFCode.getHfCode());
//鎶�鏈姸鎬侀壌瀹氳澶囩簿搴︽鏌ヨ〃
eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.TECHNICAL_STATUS_EVALUATION_PRECISION_CHECK.name());
- if(eamBaseHFCode == null) {
+ if (eamBaseHFCode == null) {
throw new JeecgBootException("鏈厤缃澶囩簿搴︽鏌ヨ〃鐨凥F缂栫爜锛屾坊鍔犲け璐ワ紒");
}
order.setHfCodeC(eamBaseHFCode.getHfCode());
this.getBaseMapper().insert(order);
//澶勭悊鏄庣粏鏁版嵁
- if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
- request.getTableDetailList().forEach(tableDetail -> {
- tableDetail.setId(null);
- tableDetail.setOrderId(order.getId());
- });
- orderDetailService.saveBatch(request.getTableDetailList());
- }
+ List<EamTechnicalStatusEvaluationOrderDetail> orderDetailList = standardDetailList.stream().map(item -> new EamTechnicalStatusEvaluationOrderDetail(item, order.getId())).collect(Collectors.toList());
+ orderDetailService.saveBatch(orderDetailList);
return true;
}
@@ -223,7 +226,7 @@
throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囬鍙栵紒");
}
EamTechnicalStatusEvaluationStandard standard = standardService.getById(entity.getStandardId());
- if(standard == null) {
+ if (standard == null) {
throw new JeecgBootException("璁惧淇濆吇鏍囧噯涓嶅瓨鍦紝璇锋鏌ワ紒");
}
EamEquipment equipment = equipmentService.getById(entity.getEquipmentId());
@@ -231,7 +234,7 @@
throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if(sysUser == null) {
+ if (sysUser == null) {
throw new JeecgBootException("涓嶆槸缁翠慨宸ワ紝鏃犳硶棰嗗彇姝ゅ伐鍗曪紒");
}
List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002);
@@ -239,6 +242,9 @@
throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨宸ワ紝鏃犳硶棰嗗彇锛�");
}
List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ if (!userApprovalList.contains(sysUser.getUsername())) {
+ throw new JeecgBootException("鎮ㄦ病鏈夐鍙栨宸ュ崟鐨勬潈闄愶紒");
+ }
entity.setEvaluator(sysUser.getUsername());
entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.UNDER_EVALUATION.name());
entity.setActualStartTime(new Date());
@@ -257,7 +263,7 @@
variables.put("comment", entity.getRemark());
}
variables.put("proofreading", true);
- if(CommonConstant.STATUS_1.equals(standard.getHasSafetyEquipmentCheck())) {
+ if (CommonConstant.STATUS_1.equals(standard.getHasSafetyEquipmentCheck())) {
variables.put("hasSafetyEquipmentCheck", CommonConstant.STATUS_1);
variables.put("safety_equipment_check", userApprovalList);
entity.setSafetyCheckCompleted(CommonConstant.STATUS_0);
@@ -265,7 +271,7 @@
variables.put("hasSafetyEquipmentCheck", CommonConstant.STATUS_0);
variables.put("safety_equipment_check", userApprovalList);
}
- if(CommonConstant.STATUS_1.equals(standard.getHasPrecisionCheck())) {
+ if (CommonConstant.STATUS_1.equals(standard.getHasPrecisionCheck())) {
variables.put("hasPrecisionCheck", CommonConstant.STATUS_1);
variables.put("equipment_precision_check", userApprovalList);
entity.setPrecisionCheckCompleted(CommonConstant.STATUS_0);
@@ -273,22 +279,394 @@
variables.put("hasPrecisionCheck", CommonConstant.STATUS_0);
variables.put("equipment_precision_check", userApprovalList);
}
- if(CommonConstant.STATUS_1.equals(standard.getHasOtherCheck())) {
+ if (CommonConstant.STATUS_1.equals(standard.getHasOtherCheck())) {
variables.put("hasOtherCheck", CommonConstant.STATUS_1);
variables.put("other_check", userApprovalList);
entity.setOtherCheckCompleted(CommonConstant.STATUS_0);
} else {
- variables.put("hasOtherCheck ", CommonConstant.STATUS_0);
+ variables.put("hasOtherCheck", CommonConstant.STATUS_0);
variables.put("other_check", userApprovalList);
}
Result<?> result = flowDefinitionService.startProcessInstanceByKey("technical_status_evaluation_process", variables);
- if(result == null || !result.isSuccess()) {
+ if (result == null || !result.isSuccess()) {
throw new JeecgBootException("鍚姩娴佺▼澶辫触锛岄鍙栧け璐�");
}
return true;
}
@Override
+ @Transactional(rollbackFor = Exception.class)
+ public EamTechnicalStatusEvaluationOrder approval(EamTechnicalStatusEvaluationOrderRequest request) {
+ EamTechnicalStatusEvaluationOrder entity = this.getBaseMapper().selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("瀹℃壒鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
+ }
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (user == null || StrUtil.isBlank(user.getId())) {
+ throw new JeecgBootException("鏈幏鍙栧埌鐧诲綍鐢ㄦ埛锛岃閲嶆柊鐧诲綍鍚庡啀璇曪紒");
+ }
+ request.setAssignee(user.getUsername());
+ // 鑾峰彇娴佺▼涓氬姟璁板綍
+ FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId(), request.getTaskId());
+ if (flowMyBusiness == null) {
+ throw new JeecgBootException("娴佺▼瀹炰緥涓嶅瓨鍦紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+
+ boolean userAuthorized = flowMyBusinessService.isUserAuthorized(flowMyBusiness, user);
+ if (!userAuthorized) {
+ throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔★紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+ // 璁ら浠诲姟
+ if (!flowMyBusinessService.claimTask(flowMyBusiness.getTaskId(), user)) {
+ throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰嗭紒");
+ }
+
+ EamEquipment equipment = equipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
+ }
+
+ TechnicalStatusEvaluationOrderStatusEnum status = TechnicalStatusEvaluationOrderStatusEnum.getInstance(entity.getEvaluationStatus());
+ if (status == null) {
+ return null;
+ }
+ //娴佺▼鍙橀噺
+ Map<String, Object> values = new HashMap<>();
+ List<String> userApprovalList;
+ 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);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨瀹や富浠伙紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }
+ userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("dataId", entity.getId());
+ values.put("organization", "鎶�鏈姸鎬侀壌瀹氭墽琛岀粨鏉�");
+ values.put("comment", "鎶�鏈姸鎬侀壌瀹氭墽琛岀粨鏉�");
+ request.setComment("鎶�鏈姸鎬侀壌瀹氭墽琛岀粨鏉�");
+ //璁剧疆entity
+ 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());
+ values.put("NextAssignee", userApprovalList);
+ entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.REPAIRER_SIGNING.name());
+ entity.setActualEndTime(new Date());
+ }
+ if ("safety_equipment_check".equals(flowMyBusiness.getTaskNameId())) {
+ //鎵ц瀹夊叏妫�鏌�
+ //瀹夊叏瑁呯疆妫�鏌ョ粨鏋滃～鎶�
+ 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_0);
+ }
+ } else if ("equipment_precision_check".equals(flowMyBusiness.getTaskNameId())) {
+ //澶勭悊绮惧害妫�楠�
+ //璁惧绮惧害妫�鏌ョ粨鏋滃～鎶�
+ 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())) {
+ //澶勭悊鍏朵粬妫�鏌�
+ //鍏朵粬妫�鏌ョ粨鏋滃～鎶�
+ 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.setOtherCheckCompleted(CommonConstant.STATUS_0);
+ }
+ }
+ break;
+ case REPAIRER_SIGNING:
+ //缁翠慨宸ョ瀛�
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0008);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨瀹や富浠伙紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }
+ userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("dataId", entity.getId());
+ values.put("organization", "缁翠慨宸ョ瀛楀畬鎴�");
+ values.put("comment", "缁翠慨宸ョ瀛楀畬鎴�");
+ values.put("NextAssignee", userApprovalList);
+ request.setComment("缁翠慨宸ョ瀛楀畬鎴�");
+ //璁剧疆entity
+ entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.REPAIR_MANAGER_SIGNING.name());
+ entity.setRepairerSignature(user.getUsername());
+ entity.setRepairerSignatureTime(new Date());
+ entity.setSafetyEquipmentCheckResult(request.getSafetyEquipmentCheckResult());
+ entity.setPrecisionCheckResult(request.getPrecisionCheckResult());
+ entity.setFunctionalCheckResult(request.getFunctionalCheckResult());
+ entity.setOtherCheckResult(request.getOtherCheckResult());
+ break;
+ case REPAIR_MANAGER_SIGNING:
+ //缁翠慨瀹や富浠荤瀛�
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0007);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰宸ヨ壓鍛橈紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }
+ userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getRepairManagerComment());
+ values.put("comment", request.getRepairManagerComment());
+ request.setComment(request.getRepairManagerComment());
+ values.put("repairManagerApprovalFlag", request.getRepairManagerSignatureResult());
+ 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);
+ entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.PROCESS_TECHNICIAN_SIGNING.name());
+ } else {
+ userApprovalList = Collections.singletonList(entity.getRepairerSignature());
+ values.put("NextAssignee", userApprovalList);
+ entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.REPAIRER_SIGNING.name());
+ }
+// //鏇存柊璁惧淇濆吇鐘舵��
+// eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.NORMAL.name());
+ break;
+ case PROCESS_TECHNICIAN_SIGNING:
+ //宸ヨ壓鍛樼瀛�
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0010);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰浣跨敤鍗曚綅鎶�鏈富绠★紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }
+ userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getProcessTechnicianComment());
+ values.put("comment", request.getProcessTechnicianComment());
+ values.put("NextAssignee", userApprovalList);
+ request.setComment(request.getProcessTechnicianComment());
+ //璁剧疆entity
+ entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.DEPART_TECHNICAL_LEADER_SIGNING.name());
+ entity.setProcessTechnicianSignature(user.getUsername());
+ entity.setProcessTechnicianSignatureTime(new Date());
+ entity.setSampleCheckResult(request.getSampleCheckResult());
+ entity.setProcessTechnicianComment(request.getProcessTechnicianComment());
+ break;
+ case DEPART_TECHNICAL_LEADER_SIGNING:
+ //浣跨敤鍗曚綅鎶�鏈富绠＄瀛�
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0003);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰璁惧妫�楠屽憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }
+ userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getDepartTechnicalLeaderComment());
+ values.put("comment", request.getDepartTechnicalLeaderComment());
+ request.setComment(request.getDepartTechnicalLeaderComment());
+ values.put("technicalLeaderApprovalFlag", request.getDepartTechnicalLeaderSignatureResult());
+ 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);
+ entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.INSPECTOR_SIGNING.name());
+ } else {
+ userApprovalList = Collections.singletonList(entity.getProcessTechnicianSignature());
+ values.put("NextAssignee", userApprovalList);
+ entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.PROCESS_TECHNICIAN_SIGNING.name());
+ }
+ break;
+ case INSPECTOR_SIGNING:
+ //璁惧妫�瀵熷憳绛惧瓧
+ values.put("dataId", entity.getId());
+ values.put("organization", request.getInspectorComment());
+ values.put("comment", request.getInspectorComment());
+ request.setComment(request.getInspectorComment());
+ //璁剧疆entity
+ entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.COMPLETED.name());
+ entity.setInspectorSignature(user.getUsername());
+ entity.setInspectorSignatureTime(new Date());
+ entity.setInspectorComment(request.getInspectorComment());
+ entity.setEvaluationResult(request.getEvaluationResult());
+ entity.setEvaluationReason(request.getEvaluationReason());
+ break;
+ }
+ request.setValues(values);
+
+ // 瀹屾垚娴佺▼浠诲姟
+ Result<?> result = flowTaskService.complete(request);
+ if (!result.isSuccess()) {
+ throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
+ }
+ //淇濆瓨宸ュ崟
+ this.getBaseMapper().updateById(entity);
+ return entity;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateEvaluationStatus(String orderId, String evaluationStatus) {
+ UpdateWrapper<EamTechnicalStatusEvaluationOrder> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id", orderId);
+ updateWrapper.set("evaluation_status", evaluationStatus);
+ updateWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+ updateWrapper.in("evaluation_status", Arrays.asList(TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name(), TechnicalStatusEvaluationOrderStatusEnum.LOCKED.name()));
+ int update = this.getBaseMapper().update(null, updateWrapper);
+ return update > 0;
+ }
+
+ @Override
+ public List<EamTechnicalStatusEvaluationOrder> selectWaitEvaluationOrderList() {
+ LambdaQueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamTechnicalStatusEvaluationOrder::getEvaluationStatus, TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name());
+ queryWrapper.isNotNull(EamTechnicalStatusEvaluationOrder::getFreezeOrderDate);
+ queryWrapper.eq(EamTechnicalStatusEvaluationOrder::getDelFlag, CommonConstant.DEL_FLAG_0);
+ LocalDate localDate = LocalDate.now();
+ queryWrapper.lt(EamTechnicalStatusEvaluationOrder::getFreezeOrderDate, localDate.toString());
+ return this.getBaseMapper().selectList(queryWrapper);
+ }
+
+ @Override
+ public List<EamTechnicalStatusEvaluationOrder> selectUncompletedEvaluationOrderList() {
+ LambdaQueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper = new LambdaQueryWrapper<>();
+ List<String> statusList = Arrays.asList(TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.UNDER_EVALUATION.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.REPAIRER_SIGNING.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.REPAIR_MANAGER_SIGNING.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.PROCESS_TECHNICIAN_SIGNING.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.DEPART_TECHNICAL_LEADER_SIGNING.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.INSPECTOR_SIGNING.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.LOCKED.name()
+ );
+ queryWrapper.in(EamTechnicalStatusEvaluationOrder::getEvaluationStatus, statusList);
+ queryWrapper.isNotNull(EamTechnicalStatusEvaluationOrder::getOrderExpirationDate);
+ queryWrapper.eq(EamTechnicalStatusEvaluationOrder::getDelFlag, CommonConstant.DEL_FLAG_0);
+ LocalDate localDate = LocalDate.now();
+ queryWrapper.lt(EamTechnicalStatusEvaluationOrder::getOrderExpirationDate, localDate.toString());
+ return this.getBaseMapper().selectList(queryWrapper);
+ }
+
+
+ private EamTechnicalStatusEvaluationOrder checkDuplicate(String equipmentId) {
+ LambdaQueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper = new LambdaQueryWrapper<>();
+ List<String> statusList = Arrays.asList(TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.UNDER_EVALUATION.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.REPAIRER_SIGNING.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.REPAIR_MANAGER_SIGNING.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.PROCESS_TECHNICIAN_SIGNING.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.DEPART_TECHNICAL_LEADER_SIGNING.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.INSPECTOR_SIGNING.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.LOCKED.name(),
+ TechnicalStatusEvaluationOrderStatusEnum.CHANGING.name()
+ );
+ queryWrapper.in(EamTechnicalStatusEvaluationOrder::getEvaluationStatus, statusList);
+ queryWrapper.eq(EamTechnicalStatusEvaluationOrder::getDelFlag, CommonConstant.DEL_FLAG_0);
+ queryWrapper.eq(EamTechnicalStatusEvaluationOrder::getEquipmentId, equipmentId);
+ List<EamTechnicalStatusEvaluationOrder> list = this.getBaseMapper().selectList(queryWrapper);
+ if (CollectionUtil.isEmpty(list)) {
+ return null;
+ }
+ return list.get(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) {
+ throw new JeecgBootException("鏈夊畨鍏ㄨ缃鏌ョ粨鏋滄湭濉啓锛�");
+ }
+ break;
+ case PRECISION_CHECK:
+ b = detailList.stream().allMatch(item -> item.getPrecisionCheckResult() != null);
+ if (!b) {
+ throw new JeecgBootException("鏈夎澶囩簿搴︽鏌ョ粨鏋滄湭濉啓锛�");
+ }
+ break;
+ case OTHER_CHECK:
+ b = detailList.stream().allMatch(item -> StringUtils.isNotBlank(item.getOtherCheckResult()));
+ if (!b) {
+ throw new JeecgBootException("鏈夊叾浠栨鏌ョ粨鏋滄湭濉啓锛�");
+ }
+ break;
+ }
+ }
+
+ @Override
public void afterFlowHandle(FlowMyBusiness business) {
business.getTaskNameId();//鎺ヤ笅鏉ュ鎵圭殑鑺傜偣
business.getValues();//鍓嶇浼犺繘鏉ョ殑鍙傛暟
--
Gitblit v1.9.3