From f1b7de2d0bf989ff38b0bd2c52d4bb8b753af42c Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 24 七月 2025 18:13:59 +0800
Subject: [PATCH] 设备维修
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java | 402 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 393 insertions(+), 9 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 727163a..3058d9f 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
@@ -1,5 +1,8 @@
package org.jeecg.modules.eam.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -8,33 +11,44 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
+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.*;
import org.jeecg.modules.eam.dto.EamReportAccidentsRegisterDto;
-import org.jeecg.modules.eam.entity.EamReportAccidentsRegister;
-import org.jeecg.modules.eam.entity.EamReportProductHazards;
-import org.jeecg.modules.eam.entity.EamReportRepair;
+import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamReportAccidentsRegisterMapper;
import org.jeecg.modules.eam.request.EamReportAccidentsRegisterQuery;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamReportAccidentsRegisterService;
import org.jeecg.modules.eam.service.IEamReportRepairService;
+import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
+import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
+import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
+import org.jeecg.modules.flowable.service.IFlowDefinitionService;
+import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.system.entity.BaseFactory;
import org.jeecg.modules.system.entity.BaseFactoryUser;
import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecg.modules.system.service.IBaseFactoryUserService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
+import javax.annotation.Resource;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -43,8 +57,8 @@
* @Date: 2025-07-17
* @Version: V1.0
*/
-@Service
-public class EamReportAccidentsRegisterServiceImpl extends ServiceImpl<EamReportAccidentsRegisterMapper, EamReportAccidentsRegister> implements IEamReportAccidentsRegisterService {
+@Service("IEamReportAccidentsRegisterService")
+public class EamReportAccidentsRegisterServiceImpl extends ServiceImpl<EamReportAccidentsRegisterMapper, EamReportAccidentsRegister> implements IEamReportAccidentsRegisterService, FlowCallBackServiceI {
@Autowired
private IBaseFactoryUserService baseFactoryUserService;
@@ -53,6 +67,26 @@
@Autowired
@Lazy
private IEamReportRepairService iEamReportRepairService;
+ @Resource
+ private FlowCommonService flowCommonService;
+
+ @Resource
+ private IFlowDefinitionService flowDefinitionService;
+
+ @Resource
+ private IEamEquipmentService eamEquipmentService;
+
+ @Resource
+ private IFlowMyBusinessService flowMyBusinessService;
+
+ @Resource
+ private TaskService taskService;
+
+ @Resource
+ private IFlowTaskService flowTaskService;
+
+ @Autowired
+ private ISysUserService sysUserService;
/**
* 鍒嗛〉鍒楄〃
* @param page
@@ -127,6 +161,13 @@
return false;
}
BeanUtils.copyProperties(eamReportAccidentsRegisterDto,eamReportAccidentsRegister);
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_SUBMIT.name());
+ UpdateWrapper<EamReportRepair> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id",eamReportAccidentsRegister.getReportId());
+ updateWrapper.set("scrap_part_number",eamReportAccidentsRegister.getScrapPartNumber());
+ updateWrapper.set("scrap_part_quantity",eamReportAccidentsRegister.getScrapPartQuantity());
+ updateWrapper.set("scrap_part_value",eamReportAccidentsRegister.getScrapPartValue());
+ iEamReportRepairService.update(updateWrapper);
this.updateById(eamReportAccidentsRegister);
return true;
}
@@ -137,8 +178,329 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result<?> submit(String id){
- return null;
+ EamReportAccidentsRegister eamReportAccidentsRegister=this.getById(id);
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ EamEquipment eamEquipment = eamEquipmentService.getById(eamReportAccidentsRegister.getEquipmentId());
+ List<UserSelector> userSelectorList = sysUserService.selectOperatorList(eamEquipment.getEquipmentCode(), eamEquipment.getFactoryOrgCode(), BusinessCodeConst.PCR0019);
+ // 鍚姩璁惧浜嬫晠鐧昏娴佺▼
+ flowCommonService.initActBusiness("璁惧缂栧彿锛�" + eamEquipment.getEquipmentCode() + ", 璁惧鍚嶇О锛�" + eamEquipment.getEquipmentName()+"鍙戣捣璁惧浜嬫晠鐧昏娴佺▼",
+ eamReportAccidentsRegister.getId(),
+ "IEamReportAccidentsRegisterService",
+ "eam_report_accidents_register",
+ null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", eamReportAccidentsRegister.getId());
+ variables.put("organization", "鎿嶄綔宸ユ彁浜ゅ惎鍔ㄦ祦绋�");
+ variables.put("comment", "鎿嶄綔宸ユ彁浜ゅ崟鍚姩娴佺▼");
+ variables.put("proofreading", true);
+ if (CollectionUtils.isEmpty(userSelectorList)) {
+ throw new JeecgBootException("璁惧鏈瓨鍦ㄥ尯闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }else {
+ List<String> usernameList = userSelectorList.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ variables.put("NextAssignee", usernameList);
+ }
+ Result result = flowDefinitionService.startProcessInstanceByKey("eam_report_accidents_register", variables);
+ if (!result.isSuccess()) {
+ return Result.error("娴佺▼鍚姩澶辫触");
+ } else {
+ eamReportAccidentsRegister.setConfirmer(user.getUsername());
+ eamReportAccidentsRegister.setConfirmTime(new Date());
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_REGIONAL_MANAGER.name());
+ this.updateById(eamReportAccidentsRegister);
+ return result;
+ }
+ }
+
+ /**
+ * 娴佺▼瀹℃牳
+ * @param eamReportAccidentsRegisterDto
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result<?> audit(EamReportAccidentsRegisterDto eamReportAccidentsRegisterDto){
+ EamReportAccidentsRegister eamReportAccidentsRegister = this.baseMapper.selectById(eamReportAccidentsRegisterDto.getId());
+ if (eamReportAccidentsRegister == null) {
+ throw new JeecgBootException("缁翠慨宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (user == null || StrUtil.isBlank(user.getId())) {
+ throw new JeecgBootException("鏈幏鍙栧埌鐧诲綍鐢ㄦ埛锛岃閲嶆柊鐧诲綍鍚庡啀璇曪紒");
+ }
+ eamReportAccidentsRegisterDto.setAssignee(user.getUsername());
+ // 鑾峰彇娴佺▼涓氬姟璁板綍
+ FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(eamReportAccidentsRegisterDto.getInstanceId());
+ if (flowMyBusiness == null) {
+ throw new JeecgBootException("娴佺▼瀹炰緥涓嶅瓨鍦紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+ boolean userAuthorized = isUserAuthorized(flowMyBusiness, user);
+ if (!userAuthorized) {
+ throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔★紝璇峰埛鏂板悗閲嶈瘯锛�");
+ }
+ // 璁ら浠诲姟
+ if (!claimTask(flowMyBusiness.getTaskId(), user)) {
+ throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰嗭紒");
+ }
+ EamEquipment equipment = eamEquipmentService.getById(eamReportAccidentsRegisterDto.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
+ }
+ EamReportAccidentsRegisterEnum status = EamReportAccidentsRegisterEnum.getInstance(eamReportAccidentsRegister.getRegisterStatus());
+ if (status == null) {
+ return null;
+ }
+ //娴佺▼鍙橀噺
+ Map<String, Object> values = new HashMap<>();
+ List<String> userApprovalList;
+ List<UserSelector> userSelectors;
+ switch (status) {
+ //寰呭尯闀垮鐞�
+ case PENDING_REGIONAL_MANAGER:
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0020);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈瓨鍦ㄤ腑蹇冧富浠伙紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }else{
+ userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
+ values.put("dataId", eamReportAccidentsRegisterDto.getId());
+ if (StrUtil.isEmpty(eamReportAccidentsRegisterDto.getDistrictConfirm())){
+ eamReportAccidentsRegisterDto.setDistrictConfirm("");
+ }
+ values.put("organization",eamReportAccidentsRegisterDto.getDistrictConfirm());
+ values.put("comment", eamReportAccidentsRegisterDto.getDistrictConfirm());
+ eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getDistrictConfirm());
+ eamReportAccidentsRegister.setDistrict(user.getUsername());
+ eamReportAccidentsRegister.setDistrictTime(new Date());
+ eamReportAccidentsRegister.setDistrictResult(eamReportAccidentsRegisterDto.getDistrictResult());
+ eamReportAccidentsRegister.setDistrictConfirm(eamReportAccidentsRegisterDto.getDistrictConfirm());
+ if ("2".equals(eamReportAccidentsRegisterDto.getDistrictResult())){
+ //鍖洪暱鎷掔粷
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
+ }else {
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_CENTER_MANAGER.name());
+ }
+ }
+ break;
+ //寰呬腑蹇冧富浠诲鐞�
+ case PENDING_CENTER_MANAGER:
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈瓨鍦ㄧ淮淇伐锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ }else{
+ userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
+ values.put("dataId", eamReportAccidentsRegisterDto.getId());
+ if (StrUtil.isEmpty(eamReportAccidentsRegisterDto.getCenterDirectorConfirm())){
+ eamReportAccidentsRegisterDto.setCenterDirectorConfirm("");
+ }
+ values.put("organization",eamReportAccidentsRegisterDto.getCenterDirectorConfirm());
+ values.put("comment", eamReportAccidentsRegisterDto.getCenterDirectorConfirm());
+ eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getCenterDirectorConfirm());
+ eamReportAccidentsRegister.setCenterDirector(user.getUsername());
+ eamReportAccidentsRegister.setCenterDirectorTime(new Date());
+ eamReportAccidentsRegister.setCenterDirectorResult(eamReportAccidentsRegisterDto.getCenterDirectorResult());
+ eamReportAccidentsRegister.setCenterDirectorConfirm(eamReportAccidentsRegisterDto.getCenterDirectorConfirm());
+ if ("2".equals(eamReportAccidentsRegisterDto.getCenterDirectorResult())){
+ //涓績涓讳换鎷掔粷
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
+ }else {
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_REPAIR_WORKER.name());
+ }
+ }
+ break;
+ //寰呯淮淇伐澶勭悊
+ case PENDING_REPAIR_WORKER:
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0008);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈瓨鍦ㄧ淮淇粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ }else{
+ userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
+ values.put("dataId", eamReportAccidentsRegisterDto.getId());
+ if (StrUtil.isEmpty(eamReportAccidentsRegisterDto.getRepairConfirmComment())){
+ eamReportAccidentsRegisterDto.setRepairConfirmComment("");
+ }
+ values.put("organization",eamReportAccidentsRegisterDto.getRepairConfirmComment());
+ values.put("comment", eamReportAccidentsRegisterDto.getRepairConfirmComment());
+ eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getRepairConfirmComment());
+ eamReportAccidentsRegister.setRepairConfirm(user.getUsername());
+ eamReportAccidentsRegister.setRepairConfirmTime(new Date());
+ eamReportAccidentsRegister.setRepairConfirmResult(eamReportAccidentsRegisterDto.getRepairConfirmResult());
+ eamReportAccidentsRegister.setRepairConfirmComment(eamReportAccidentsRegisterDto.getRepairConfirmComment());
+ eamReportAccidentsRegister.setReportStartTime(eamReportAccidentsRegisterDto.getReportStartTime());
+ eamReportAccidentsRegister.setEquipmentStatus(eamReportAccidentsRegisterDto.getEquipmentStatus());
+ eamReportAccidentsRegister.setCauseAnalysis(eamReportAccidentsRegisterDto.getCauseAnalysis());
+ eamReportAccidentsRegister.setInspectionResults(eamReportAccidentsRegisterDto.getInspectionResults());
+ eamReportAccidentsRegister.setTakeSteps(eamReportAccidentsRegisterDto.getTakeSteps());
+ 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());
+ }
+ }
+ break;
+ //寰呯淮淇粍闀垮鐞�
+ case PENDING_REPAIR_TEAM_LEADER:
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0013);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈瓨鍦ㄧ淮淇粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒");
+ }
+ userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
+ if (StrUtil.isEmpty(eamReportAccidentsRegisterDto.getRepairGroupLeaderComment())){
+ eamReportAccidentsRegisterDto.setRepairGroupLeaderComment("");
+ }
+ values.put("organization",eamReportAccidentsRegisterDto.getRepairGroupLeaderComment());
+ values.put("comment", eamReportAccidentsRegisterDto.getRepairGroupLeaderComment());
+ eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getRepairGroupLeaderComment());
+ eamReportAccidentsRegister.setRepairGroupLeader(user.getUsername());
+ eamReportAccidentsRegister.setRepairGroupLeaderTime(new Date());
+ eamReportAccidentsRegister.setRepairGroupLeaderResult(eamReportAccidentsRegisterDto.getRepairGroupLeaderResult());
+ eamReportAccidentsRegister.setRepairGroupLeaderComment(eamReportAccidentsRegisterDto.getRepairGroupLeaderComment());
+ if ("2".equals(eamReportAccidentsRegisterDto.getRepairGroupLeaderResult())){
+ //缁翠慨缁勯暱鎷掔粷
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
+ }else {
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_REPAIR_REGIONAL_MANAGER.name());
+ }
+ break;
+ //寰呯淮淇尯闀垮鐞�
+ case PENDING_REPAIR_REGIONAL_MANAGER:
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0021);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈瓨鍦ㄦ妧鏈礋璐ｄ汉锛屾棤娉曡繘鍏ヤ笅绾у鎵�");
+ }
+ userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
+ if (StrUtil.isEmpty(eamReportAccidentsRegisterDto.getRepairDistrictComment())){
+ eamReportAccidentsRegisterDto.setRepairDistrictComment("");
+ }
+ values.put("organization",eamReportAccidentsRegisterDto.getRepairDistrictComment());
+ values.put("comment", eamReportAccidentsRegisterDto.getRepairDistrictComment());
+ 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())){
+ //缁翠慨鍖洪暱鎷掔粷
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
+ }else {
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_REPAIR_REGIONAL_MANAGER.name());
+ }
+ break;
+ //寰呮妧鏈礋璐ｄ汉澶勭悊
+ case PENDING_TECHNICAL_RESPONSIBLE:
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0022);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈瓨鍦ㄦ妧鏈富绠″绾ч瀵硷紝鏃犳硶杩涘叆涓嬬骇瀹℃壒");
+ }
+ userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
+ if (StrUtil.isEmpty(eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm())){
+ eamReportAccidentsRegisterDto.setTechnicalDirectorConfirm("");
+ }
+ values.put("organization",eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm());
+ values.put("comment", eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm());
+ eamReportAccidentsRegisterDto.setComment(eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm());
+ eamReportAccidentsRegister.setCheckAgree(eamReportAccidentsRegisterDto.getCheckAgree());
+ eamReportAccidentsRegister.setDisagreeReason(eamReportAccidentsRegisterDto.getDisagreeReason());
+ eamReportAccidentsRegister.setRectificationMeasures(eamReportAccidentsRegisterDto.getRectificationMeasures());
+ eamReportAccidentsRegister.setAccidentConclusion(eamReportAccidentsRegisterDto.getAccidentConclusion());
+ eamReportAccidentsRegister.setTechnicalDirector(user.getUsername());
+ eamReportAccidentsRegister.setTechnicalDirectorTime(new Date());
+ eamReportAccidentsRegister.setTechnicalDirectorResult(eamReportAccidentsRegisterDto.getTechnicalDirectorResult());
+ eamReportAccidentsRegister.setTechnicalDirectorConfirm(eamReportAccidentsRegisterDto.getTechnicalDirectorConfirm());
+ if ("2".equals(eamReportAccidentsRegisterDto.getCenterDirectorResult())){
+ //鎶�鏈礋璐ｄ汉鎷掔粷
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
+ }else {
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_TECHNICAL_SUPERVISOR.name());
+ }
+ break;
+ //寰呮妧鏈富绠″绾ч瀵煎鐞�
+ case PENDING_TECHNICAL_SUPERVISOR:
+ userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0023);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈瓨鍦ㄤ富绠￠儴绾ч瀵硷紝鏃犳硶杩涘叆涓嬬骇瀹℃壒");
+ }
+ userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
+ values.put("NextAssignee", userApprovalList);
+ if (StrUtil.isEmpty(eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderConfirm())){
+ eamReportAccidentsRegisterDto.setTechnicalDirectorLeaderConfirm("");
+ }
+ values.put("organization",eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderConfirm());
+ values.put("comment", eamReportAccidentsRegisterDto.getTechnicalDirectorLeaderConfirm());
+ 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())){
+ //鎶�鏈富绠″绾ч瀵兼嫆缁�
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
+ }else {
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_SUPERIOR_DEPARTMENT.name());
+ }
+ break;
+ //寰呬富绠￠儴绾ч瀵煎鐞�
+ case PENDING_SUPERIOR_DEPARTMENT:
+ if (StrUtil.isEmpty(eamReportAccidentsRegisterDto.getTechnicalDirectorPartConfirm())){
+ eamReportAccidentsRegisterDto.setTechnicalDirectorPartConfirm("");
+ }
+ values.put("organization",eamReportAccidentsRegisterDto.getTechnicalDirectorPartConfirm());
+ values.put("comment", eamReportAccidentsRegisterDto.getTechnicalDirectorPartConfirm());
+ 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())){
+ //鎶�鏈富绠″绾ч瀵兼嫆缁�
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
+ }else {
+ eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REPAIR_COMPLETED.name());
+ }
+ break;
+ default:
+ throw new JeecgBootException("瀹℃壒澶辫触");
+ }
+ eamReportAccidentsRegisterDto.setValues(values);
+ Result result = flowTaskService.complete(eamReportAccidentsRegisterDto);
+ if (!result.isSuccess()) {
+ throw new JeecgBootException("瀹℃壒澶辫触锛岃鍒锋柊鏌ョ湅锛�");
+ }
+ //淇濆瓨宸ュ崟
+ this.updateById(eamReportAccidentsRegister);
+ return result;
+ }
+
+ private boolean claimTask(String taskId, LoginUser user) {
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ if (task == null) {
+ return false;
+ }
+ if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
+ return false;
+ }
+ taskService.claim(taskId, user.getUsername());
+ return true;
+ }
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁姝ゆ潈闄�
+ * @param flowMyBusiness
+ * @param user
+ * @return
+ */
+ private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
+ List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
+ return todoUsers != null && todoUsers.contains(user.getUsername());
}
/**
@@ -167,4 +529,26 @@
this.removeById(id);
return true;
}
+
+ @Override
+ public void afterFlowHandle(FlowMyBusiness business) {
+
+ }
+
+ @Override
+ public Object getBusinessDataById(String dataId) {
+ return null;
+ }
+
+ @Override
+ public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
+ return Collections.emptyMap();
+ }
+
+ @Override
+ public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
+ //鑾峰彇涓嬩竴姝ュ鐞嗕汉
+ Object object = values.get("NextAssignee");
+ return (List<String>) object;
+ }
}
--
Gitblit v1.9.3