art: 我的待办-查询问题修正

zhangherong

10 天以前 b463880866cb946b824e989667ff3f0c0faf22f6

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java

@@ -3,17 +3,16 @@
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.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 com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
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.FileUploadResult;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
@@ -21,10 +20,8 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.ThirdMaintenanceStatusEnum;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail;
@@ -38,8 +35,11 @@
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.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -79,8 +79,14 @@
    private IEamReportRepairService eamReportRepairService;
    @Autowired
    private IEamEquipmentExtendService eamEquipmentExtendService;
    @Autowired
    private IEamPrecisionCheckDetailService precisionCheckDetailService;

    @Resource
    private IBaseFactoryUserService baseFactoryUserService;
    @Resource
    private IBaseFactoryService baseFactoryService;

    @Resource
    private IEamBaseHFCodeService eamBaseHFCodeService;

    @Override
    public IPage<EamThirdMaintenanceOrder> queryPageList(Page<EamThirdMaintenanceOrder> page, EamThirdMaintenanceQuery query) {
@@ -95,8 +101,16 @@
            List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
            queryWrapper.in("e.equipment_code", equipArr);
        } else {
            //没有选择设备，根据车间过滤设备
            queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
            //没有选择设备，根据中心过滤设备
            List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService.
                    list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId()));
            if (!CollectionUtils.isEmpty(baseFactoryUserList)) {
                Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
                Set<String> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
                queryWrapper.in("e.factory_org_code", factoryCode);
            }else {
                return page;
            }
        }
        //查询条件过滤
        if (query != null) {
@@ -135,23 +149,40 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean addMaintenance(EamThirdMaintenanceRequest request) {
    public Result<String> addMaintenance(EamThirdMaintenanceRequest request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        if (CollectionUtil.isEmpty(request.getTableDetailList())) {
            return Result.error("保养项不能为空！");
        }
        EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，添加失败！");
            return Result.error("设备不存在，添加失败！");
        }
        EamThirdMaintenanceOrder order = new EamThirdMaintenanceOrder();
        order.setOrderNum(request.getOrderNum());
        order.setEquipmentId(request.getEquipmentId());
        order.setStandardId(request.getStandardId());
        order.setMaintenanceDate(request.getMaintenanceDate());
        order.setOperator(request.getOperator());
        order.setRemark(request.getRemark());
        //状态初始化
        order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
        order.setCreationMethod(request.getCreationMethod());
        //删除标记
        order.setDelFlag(CommonConstant.DEL_FLAG_0);
        //HF码处理  三保移交单HF编码
        EamBaseHFCode hFCodeA = eamBaseHFCodeService.selectByCategory(HfTemplateCategoryEnum.THIRD_MAINTENANCE_HANDOVER.name());
        if (hFCodeA == null) {
            return Result.error("添加失败,未配置三保移交单HF编码！");
        }
        order.setHfCodeA(hFCodeA.getHfCode());
        // 三保验收单HF编码
        EamBaseHFCode hFCodeB = eamBaseHFCodeService.selectByCategory(HfTemplateCategoryEnum.THIRD_MAINTENANCE_ACCEPTANCE.name());
        if (hFCodeB == null) {
            return Result.error("添加失败,未配置三保验收单HF编码！");
        }
        order.setHfCodeB(hFCodeB.getHfCode());
        eamThirdMaintenanceOrderMapper.insert(order);
        //处理明细数据
        if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
@@ -161,41 +192,8 @@
            });
            thirdMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
        }
        //处理精度参数
        if (CollectionUtil.isNotEmpty(request.getPrecisionDetailList())) {
            request.getPrecisionDetailList().forEach(tableDetail -> {
                tableDetail.setId(null);
                tableDetail.setOrderId(order.getId());
            });
            precisionCheckDetailService.saveBatch(request.getPrecisionDetailList());
        }
        //判断是否存在保养人 如果存在则启动流程
        if (StringUtils.isNotBlank(order.getOperator())) {
            //启动流程
            flowCommonService.initActBusiness("工单号:" + order.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";安装位置" + equipment.getInstallationPosition(),
                    order.getId(), "IEamThirdMaintenanceOrderService", "third_maintenance_process", null);
            Map<String, Object> variables = new HashMap<>();
            variables.put("dataId", order.getId());
            if (StrUtil.isEmpty(order.getRemark())) {
                variables.put("organization", "新增三保工单默认启动流程");
                variables.put("comment", "新增三保工单默认启动流程");
            } else {
                variables.put("organization", order.getRemark());
                variables.put("comment", order.getRemark());
            }
            variables.put("proofreading", true);
            //并行任务会签
            variables.put("maintenance_execution", Collections.singletonList(request.getOperator()));
            variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
            Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
            if (result != null) {
                //更新设备保养状态
                eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_THIRD_MAINTENANCE.name());
                return result.isSuccess();
            }
        }

        return true;
        return Result.OK("添加成功！");
    }

    @Override
@@ -213,7 +211,6 @@
            throw new JeecgBootException("只有待保养状态的数据才可编辑！");
        }
        entity.setMaintenanceDate(request.getMaintenanceDate());
        entity.setOperator(request.getOperator());
        entity.setRemark(request.getRemark());

        eamThirdMaintenanceOrderMapper.updateById(entity);
@@ -240,32 +237,6 @@
            List<String> ids = request.getRemoveDetailList().stream().map(EamThirdMaintenanceOrderDetail::getId).collect(Collectors.toList());
            thirdMaintenanceOrderDetailService.removeBatchByIds(ids);
        }
        //判断是否存在保养人 如果存在则启动流程
        if (StringUtils.isNotBlank(entity.getOperator())) {
            //启动流程
            flowCommonService.initActBusiness("工单号:" + entity.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";安装位置" + equipment.getInstallationPosition(),
                    entity.getId(), "IEamThirdMaintenanceOrderService", "third_maintenance_process", null);
            Map<String, Object> variables = new HashMap<>();
            variables.put("dataId", entity.getId());
            if (StrUtil.isEmpty(entity.getRemark())) {
                variables.put("organization", "新增三保工单默认启动流程");
                variables.put("comment", "新增三保工单默认启动流程");
            } else {
                variables.put("organization", entity.getRemark());
                variables.put("comment", entity.getRemark());
            }
            variables.put("proofreading", true);
            //并行任务会签
            variables.put("maintenance_execution", Collections.singletonList(request.getOperator()));
            variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
            Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
            if (result != null) {
                //更新设备保养状态
                eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_THIRD_MAINTENANCE.name());
                return result.isSuccess();
            }

        }
        return true;
    }

@@ -283,14 +254,14 @@
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，添加失败！");
        }
        if (StringUtils.isBlank(equipment.getEquipmentManager())) {
            throw new JeecgBootException("设备未分配设备管理员，无法进入下级审批！");
        }
//        if (StringUtils.isBlank(equipment.getEquipmentManager())) {
//            throw new JeecgBootException("设备未分配设备管理员，无法进入下级审批！");
//        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null || !BusinessCodeConst.PCR0001.equals(sysUser.getPost())) {
            throw new JeecgBootException("不是操作工，无法领取此工单！");
        }
        entity.setOperator(sysUser.getUsername());
        entity.setRepairman(sysUser.getUsername());
        entity.setMaintenanceStatus(ThirdMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
        entity.setActualStartTime(new Date());
        eamThirdMaintenanceOrderMapper.updateById(entity);
@@ -299,8 +270,8 @@
        flowCommonService.initActBusiness("工单号:" + entity.getOrderNum() + ";设备编号: " + equipment.getEquipmentCode() + ";安装位置" + equipment.getInstallationPosition(),
                entity.getId(), "IEamThirdMaintenanceOrderService", "third_maintenance_process", null);
        Map<String, Object> variables = new HashMap<>();
        boolean equipmentPrecisionFlag = precisionCheckDetailService.hasPrecisionCheckDetail(entity.getId());
        variables.put("equipmentPrecisionFlag", equipmentPrecisionFlag);
//        boolean equipmentPrecisionFlag = precisionCheckDetailService.hasPrecisionCheckDetail(entity.getId());
//        variables.put("equipmentPrecisionFlag", equipmentPrecisionFlag);
        variables.put("dataId", entity.getId());
        if (StrUtil.isEmpty(entity.getRemark())) {
            variables.put("organization", "新增三保工单默认启动流程");
@@ -312,7 +283,7 @@
        variables.put("proofreading", true);
        //并行任务会签
        variables.put("maintenance_execution", Collections.singletonList(sysUser.getUsername()));
        variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
//        variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
        Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
        if (result != null) {
            //更新设备保养状态
@@ -330,138 +301,138 @@
        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 = isUserAuthorized(flowMyBusiness, user);
        if (!userAuthorized) {
            throw new JeecgBootException("用户无权操作此任务，请刷新后重试！");
        }
        // 认领任务
        if (!claimTask(flowMyBusiness.getTaskId(), user)) {
            throw new JeecgBootException("任务不存在、已完成或已被他人认领！");
        }

        EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，请检查！");
        }

        ThirdMaintenanceStatusEnum status = ThirdMaintenanceStatusEnum.getInstance(entity.getMaintenanceStatus());
        if (status == null) {
            return null;
        }
        //流程变量
        Map<String, Object> values = new HashMap<>();
        List<String> userApprovalList;
        List<UserSelector> userSelectors;
        switch (status) {
            case UNDER_MAINTENANCE:
                boolean parallelCompletion = flowTaskService.checkParallelCompletion(flowMyBusiness.getTaskId());
                //执行完成
                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0006);
                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", "三保执行结束");
                if (parallelCompletion) {
                    values.put("NextAssignee", userApprovalList);
                }
                request.setComment("三保执行结束");
                //设置entity
                if (parallelCompletion) {
                    entity.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_CONFIRM.name());
                    entity.setActualEndTime(new Date());
                }
                if ("maintenance_execution".equals(flowMyBusiness.getTaskNameId())) {
                    //执行保养
                    //处理附件
                    if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
                        List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
                        ObjectMapper mapper = new ObjectMapper();
                        try {
                            String referenceFile = mapper.writeValueAsString(fileUploadResultList);
                            entity.setImageFiles(referenceFile);
                        } catch (JsonProcessingException e) {
                            log.error("JSON转换失败：" + e.getMessage(), e);
                        }
                    }
                    //处理详情
                    if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
                        thirdMaintenanceOrderDetailService.updateBatchById(request.getTableDetailList());
                    }
                } else if ("precision_check".equals(flowMyBusiness.getTaskNameId())) {
                    entity.setPrecisionChecker(user.getUsername());
                    entity.setPrecisionCheckTime(new Date());
                    //处理精度检验
                    if (CollectionUtil.isNotEmpty(request.getPrecisionDetailList())) {
                        precisionCheckDetailService.updateBatchById(request.getPrecisionDetailList());
                    }
                }
                if (parallelCompletion) {
                    //更新设备保养状态
                    eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.THIRD_MAINTENANCE_WAIT_CONFIRM.name());
                }
                break;
            case WAIT_CONFIRM:
                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), 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.getConfirmComment());
                values.put("comment", request.getConfirmComment());
                values.put("NextAssignee", userApprovalList);
                values.put("confirmation", request.getConfirmDealType());
                request.setComment(request.getConfirmComment());
                //设置entity
                entity.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_LEADER_CONFIRM.name());
                entity.setConfirmUser(user.getUsername());
                entity.setConfirmComment(request.getConfirmComment());
                entity.setConfirmTime(new Date());
                //处理报修
                List<EamThirdMaintenanceOrderDetail> collect = request.getTableDetailList().stream().filter((detail) -> CommonConstant.DEFAULT_1.equals(detail.getReportFlag())).collect(Collectors.toList());
                if (CollectionUtil.isNotEmpty(collect)) {
                    eamReportRepairService.reportRepairFromThirdMaintenance(equipment.getId(), entity.getOperator(), collect);
                }
                break;
            case WAIT_LEADER_CONFIRM:
                values.put("dataId", entity.getId());
                values.put("organization", request.getLeaderConfirmComment());
                values.put("comment", request.getLeaderConfirmComment());
                request.setComment(request.getLeaderConfirmComment());
                //设置entity
                entity.setMaintenanceStatus(ThirdMaintenanceStatusEnum.COMPLETE.name());
                entity.setConfirmLeader(user.getUsername());
                entity.setLeaderConfirmComment(request.getLeaderConfirmComment());
                entity.setLeaderConfirmTime(new Date());
                //更新设备保养状态
                eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.NORMAL.name());
                break;
        }
        request.setValues(values);

        // 完成流程任务
        Result result = flowTaskService.complete(request);
        if (!result.isSuccess()) {
            throw new JeecgBootException("审批失败，请刷新查看！");
        }
        //保存工单
        eamThirdMaintenanceOrderMapper.updateById(entity);
//        // 获取当前登录用户
//        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 = isUserAuthorized(flowMyBusiness, user);
//        if (!userAuthorized) {
//            throw new JeecgBootException("用户无权操作此任务，请刷新后重试！");
//        }
//        // 认领任务
//        if (!claimTask(flowMyBusiness.getTaskId(), user)) {
//            throw new JeecgBootException("任务不存在、已完成或已被他人认领！");
//        }
//
//        EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
//        if (equipment == null) {
//            throw new JeecgBootException("设备不存在，请检查！");
//        }
//
//        ThirdMaintenanceStatusEnum status = ThirdMaintenanceStatusEnum.getInstance(entity.getMaintenanceStatus());
//        if (status == null) {
//            return null;
//        }
//        //流程变量
//        Map<String, Object> values = new HashMap<>();
//        List<String> userApprovalList;
//        List<UserSelector> userSelectors;
//        switch (status) {
//            case UNDER_MAINTENANCE:
//                boolean parallelCompletion = flowTaskService.checkParallelCompletion(flowMyBusiness.getTaskId());
//                //执行完成
//                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), null, BusinessCodeConst.PCR0006);
//                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", "三保执行结束");
//                if (parallelCompletion) {
//                    values.put("NextAssignee", userApprovalList);
//                }
//                request.setComment("三保执行结束");
//                //设置entity
//                if (parallelCompletion) {
//                    entity.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_CONFIRM.name());
//                    entity.setActualEndTime(new Date());
//                }
//                if ("maintenance_execution".equals(flowMyBusiness.getTaskNameId())) {
//                    //执行保养
//                    //处理附件
//                    if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
//                        List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
//                        ObjectMapper mapper = new ObjectMapper();
//                        try {
//                            String referenceFile = mapper.writeValueAsString(fileUploadResultList);
//                            entity.setImageFiles(referenceFile);
//                        } catch (JsonProcessingException e) {
//                            log.error("JSON转换失败：" + e.getMessage(), e);
//                        }
//                    }
//                    //处理详情
//                    if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
//                        thirdMaintenanceOrderDetailService.updateBatchById(request.getTableDetailList());
//                    }
//                } else if ("precision_check".equals(flowMyBusiness.getTaskNameId())) {
//                    entity.setPrecisionChecker(user.getUsername());
//                    entity.setPrecisionCheckTime(new Date());
//                    //处理精度检验
//                    if (CollectionUtil.isNotEmpty(request.getPrecisionDetailList())) {
//                        precisionCheckDetailService.updateBatchById(request.getPrecisionDetailList());
//                    }
//                }
//                if (parallelCompletion) {
//                    //更新设备保养状态
//                    eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.THIRD_MAINTENANCE_WAIT_CONFIRM.name());
//                }
//                break;
//            case WAIT_CONFIRM:
//                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(),null, 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.getConfirmComment());
//                values.put("comment", request.getConfirmComment());
//                values.put("NextAssignee", userApprovalList);
//                values.put("confirmation", request.getConfirmDealType());
//                request.setComment(request.getConfirmComment());
//                //设置entity
//                entity.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_LEADER_CONFIRM.name());
//                entity.setConfirmUser(user.getUsername());
//                entity.setConfirmComment(request.getConfirmComment());
//                entity.setConfirmTime(new Date());
//                //处理报修
//                List<EamThirdMaintenanceOrderDetail> collect = request.getTableDetailList().stream().filter((detail) -> CommonConstant.DEFAULT_1.equals(detail.getReportFlag())).collect(Collectors.toList());
//                if (CollectionUtil.isNotEmpty(collect)) {
//                    eamReportRepairService.reportRepairFromThirdMaintenance(equipment.getId(), entity.getOperator(), collect);
//                }
//                break;
//            case WAIT_LEADER_CONFIRM:
//                values.put("dataId", entity.getId());
//                values.put("organization", request.getLeaderConfirmComment());
//                values.put("comment", request.getLeaderConfirmComment());
//                request.setComment(request.getLeaderConfirmComment());
//                //设置entity
//                entity.setMaintenanceStatus(ThirdMaintenanceStatusEnum.COMPLETE.name());
//                entity.setConfirmLeader(user.getUsername());
//                entity.setLeaderConfirmComment(request.getLeaderConfirmComment());
//                entity.setLeaderConfirmTime(new Date());
//                //更新设备保养状态
//                eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.NORMAL.name());
//                break;
//        }
//        request.setValues(values);
//
//        // 完成流程任务
//        Result result = flowTaskService.complete(request);
//        if (!result.isSuccess()) {
//            throw new JeecgBootException("审批失败，请刷新查看！");
//        }
//        //保存工单
//        eamThirdMaintenanceOrderMapper.updateById(entity);
        return entity;
    }