Merge remote-tracking branch 'origin/master'

lyh

昨天 bc8cd378fd72f43e66120c540f57f630580aa093

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

@@ -1,6 +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.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,19 +11,20 @@
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.AssetStatusEnum;
import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.mapper.EamEquipmentLeanOutMapper;
import org.jeecg.modules.eam.request.EamEquipmentLeanOutQuery;
import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
import org.jeecg.modules.eam.service.IEamEquipmentLeanOutService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
@@ -30,14 +33,15 @@
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.service.IMdcProductionService;
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;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @Description: 设备借出归还
@@ -82,8 +86,6 @@
            //没有选择设备，根据车间过滤设备
            queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
        }
        //控制待提交状态的数据只能本人查看
        queryWrapper.and(i -> i.ne("wmo.lean_status", EquipmentLeanOutStatusEnum.WAIT_SUBMIT).or().eq("wmo.lean_person", sysUser.getUsername()));
        //查询条件过滤
        if (query != null) {
            if (StringUtils.isNotBlank(query.getEquipmentId())) {
@@ -190,7 +192,7 @@
            throw new JeecgBootException("要提交的数据不存在，请刷新重试！");
        }
        if (!EquipmentLeanOutStatusEnum.WAIT_SUBMIT.name().equals(entity.getLeanStatus())) {
            throw new JeecgBootException("当前数据状态不允许编辑！");
            throw new JeecgBootException("该工单已进行过提交！");
        }
        //检查设备
        EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
@@ -200,12 +202,18 @@
        if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
            throw new JeecgBootException("此设备当前资产状态不允许借出！");
        }
        // 分配给使用单位领导
        List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0008);
        if (CollectionUtil.isEmpty(userSelectors)) {
            throw new JeecgBootException("设备未分配给单位领导，无法进入下级审批！");
        }
        List<String> usernames = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法编辑借用记录！");
        if (sysUser == null || !BusinessCodeConst.PCR0004.equals(sysUser.getPost())) {
            throw new JeecgBootException("不是设备管理员，无法提交此工单！");
        }
        UpdateWrapper<EamEquipmentLeanOut> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("lean_status", EquipmentLeanOutStatusEnum.WAIT_APPROVAL.name());
        updateWrapper.set("lean_status", EquipmentLeanOutStatusEnum.WAIT_APPROVAL_OUT.name());
        updateWrapper.eq("id", id);
        updateWrapper.eq("lean_person", sysUser.getUsername());
        boolean success = super.update(updateWrapper);
@@ -226,11 +234,13 @@
            variables.put("comment", entity.getLeanReason());
        }
        variables.put("proofreading", true);
        List<String> usernames = new ArrayList<>();
        usernames.add(equipment.getEquipmentManager());
        variables.put("NextAssignee", usernames);
        Result result = flowDefinitionService.startProcessInstanceByKey("equipment_lean_out", variables);
        if (result != null) {
            entity.setLeanStartTime(new Date());
            entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_APPROVAL_OUT.name());
            //保存工单
            equipmentLeanOutMapper.updateById(entity);
            return result.isSuccess();
        }
        return true;
@@ -238,10 +248,241 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public EamEquipmentLeanOut approval(EamEquipmentLeanOut request) {
        // TODO
        return null;
    public boolean equipmentReturn(String id) {
        EamEquipmentLeanOut entity = equipmentLeanOutMapper.selectById(id);
        if (entity == null) {
            throw new JeecgBootException("要提交的数据不存在，请刷新重试！");
        }
        if (!EquipmentLeanOutStatusEnum.WAIT_RETURN.name().equals(entity.getLeanStatus())) {
            throw new JeecgBootException("当前数据状态不允许编辑！");
        }
        //检查设备
        EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在！");
        }
        // 分配给借用单位领导
        List<UserSelector> userSelectors = sysUserService.selectOperatorList(entity.getLeanDepartId(), BusinessCodeConst.PCR0008);
        if (CollectionUtil.isEmpty(userSelectors)) {
            throw new JeecgBootException("设备未分配给单位领导，无法进入下级审批！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null || !BusinessCodeConst.PCR0004.equals(sysUser.getPost())) {
            throw new JeecgBootException("不是设备管理员，无法提交此工单！");
        }
        //启动审批流程
        flowCommonService.initActBusiness("工单号:" + entity.getCode() + ";设备编号: " + equipment.getEquipmentCode() + ";进行设备归还",
                entity.getId(), "IEamEquipmentLeanOutService", "equipment_return", null);
        Map<String, Object> variables = new HashMap<>();
        variables.put("dataId", entity.getId());
        variables.put("organization", "新增归还默认归还流程");
        variables.put("comment", "新增归还默认归还流程");
        variables.put("proofreading", true);

        List<String> usernames = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
        variables.put("NextAssignee", usernames);
        Result result = flowDefinitionService.startProcessInstanceByKey("equipment_return", variables);
        if (result != null) {
            entity.setLeanEndTime(new Date());
            entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_CONFIRM_RETURN.name());
            //保存工单
            equipmentLeanOutMapper.updateById(entity);
            return result.isSuccess();
        }
        return true;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.LEAN_OUT, businessTable = "eam_equipment_lean_out")
    public EamEquipmentLeanOut approval(EamEquipmentLeanOutRequest request) {
        EamEquipmentLeanOut entity = equipmentLeanOutMapper.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.setApprovalUser(user.getUsername());
        // 获取流程业务记录
        FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.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(entity.getEquipmentId());
        if (equipment == null) {
            throw new JeecgBootException("设备不存在，请检查！");
        }

        //设置流程变量
        setupProcessVariables(request, entity, user, equipment);

        // 完成流程任务
        Result result = flowTaskService.complete(request);
        if (!result.isSuccess()) {
            throw new JeecgBootException("审批失败，请刷新查看！");
        }

        // 根据任务完成结果更新工单状态
        updateOrderStatus(result, request, entity, user, equipment);

        //保存工单
        equipmentLeanOutMapper.updateById(entity);
        return entity;
    }

    /**
     * 更新工单状态
     * @param result
     * @param request
     * @param entity
     * @param user
     * @param equipment
     */
    private void updateOrderStatus(Result result, EamEquipmentLeanOutRequest request, EamEquipmentLeanOut entity, LoginUser user, EamEquipment equipment) {
        if (result.isSuccess()) {
            EquipmentLeanOutStatusEnum status = EquipmentLeanOutStatusEnum.getInstance(entity.getLeanStatus());
            switch (status) {
                case WAIT_APPROVAL_OUT:
                    entity.setUseApprovalUser(user.getUsername());
                    entity.setUseApprovalComment(request.getUseApprovalComment());
                    entity.setUseApprovalTime(new Date());
                    entity.setUseApprovalDealType(request.getUseApprovalDealType());
                    if (CommonConstant.APPROVED.equals(request.getUseApprovalDealType())) {
                        entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_APPROVAL_IN.name());
                    } else {
                        entity.setLeanStatus(EquipmentLeanOutStatusEnum.REJECT.name());
                        equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
                        eamEquipmentService.updateById(equipment);
                    }
                    break;
                case WAIT_APPROVAL_IN:
                    entity.setLeanOutApprovalUser(user.getUsername());
                    entity.setLeanOutApprovalComment(request.getLeanOutApprovalComment());
                    entity.setLeanOutApprovalTime(new Date());
                    entity.setLeanOutApprovalDealType(request.getLeanOutApprovalDealType());
                    if (CommonConstant.APPROVED.equals(request.getLeanOutApprovalDealType())) {
                        entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_RETURN.name());
                    } else {
                        entity.setLeanStatus(EquipmentLeanOutStatusEnum.REJECT.name());
                        equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
                        eamEquipmentService.updateById(equipment);
                    }
                    break;
                case WAIT_CONFIRM_RETURN:
                    entity.setLeanOutConfirmUser(user.getUsername());
                    entity.setLeanOutConfirmComment(request.getLeanOutConfirmComment());
                    entity.setLeanOutConfirmTime(new Date());
                    entity.setLeanOutConfirmDealType(request.getLeanOutConfirmDealType());
                    if (CommonConstant.APPROVED.equals(request.getLeanOutConfirmDealType())) {
                        entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_CONFIRM_BORROW.name());
                    } else {
                        entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_RETURN.name());
                    }
                    break;
                case WAIT_CONFIRM_BORROW:
                    entity.setUseConfirmUser(user.getUsername());
                    entity.setUseConfirmComment(request.getUseConfirmComment());
                    entity.setUseConfirmTime(new Date());
                    entity.setUseConfirmDealType(request.getUseConfirmDealType());
                    if (CommonConstant.APPROVED.equals(request.getUseConfirmDealType())) {
                        entity.setLeanStatus(EquipmentLeanOutStatusEnum.COMPLETE.name());
                        equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
                        eamEquipmentService.updateById(equipment);
                    } else {
                        entity.setLeanStatus(EquipmentLeanOutStatusEnum.WAIT_RETURN.name());
                    }
                    break;
            }
        }
    }

    /**
     * 更新流程状态
     *
     * @param request
     * @param entity
     * @param user
     * @param equipment
     */
    private void setupProcessVariables(EamEquipmentLeanOutRequest request, EamEquipmentLeanOut entity, LoginUser user, EamEquipment equipment) {
        Map<String, Object> values = new HashMap<>();
        List<UserSelector> userSelectors;
        List<String> userApprovalList;
        EquipmentLeanOutStatusEnum status = EquipmentLeanOutStatusEnum.getInstance(entity.getLeanStatus());
        switch (status) {
            case WAIT_APPROVAL_OUT:
                // 使用单位出厂审批完成
                values.put("dataId", entity.getId());
                values.put("organization", request.getUseApprovalComment());
                values.put("comment", request.getUseApprovalComment());
                if (CommonConstant.APPROVED.equals(request.getUseApprovalDealType())) {
                    // 通过
                    values.put("approvalDealType", request.getUseApprovalDealType());
                    // 获取下一步审批人
                    userSelectors = sysUserService.selectOperatorList(entity.getLeanDepartId(), BusinessCodeConst.PCR0008);
                    if (CollectionUtil.isEmpty(userSelectors)) {
                        throw new JeecgBootException("未分配借用车间单位领导，无法进入下级审批！");
                    }
                    userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                    values.put("NextAssignee", userApprovalList);
                } else {
                    // 驳回
                    values.put("approvalDealType", request.getUseApprovalDealType());
                }
                request.setComment("使用单位出厂审批完成");
                break;
            case WAIT_APPROVAL_IN:
                // 借用单位入厂审批完成
                values.put("dataId", entity.getId());
                values.put("organization", request.getLeanOutApprovalComment());
                values.put("comment", request.getLeanOutApprovalComment());
                request.setComment("借用单位入厂审批完成");
                break;
            case WAIT_CONFIRM_RETURN:
                // 归还单位确认完成
                values.put("dataId", entity.getId());
                values.put("organization", request.getLeanOutConfirmComment());
                values.put("comment", request.getLeanOutConfirmComment());
                if (CommonConstant.APPROVED.equals(request.getLeanOutConfirmDealType())) {
                    // 通过
                    values.put("approvalDealType", request.getLeanOutConfirmDealType());
                    // 获取下一步审批人
                    userSelectors = sysUserService.selectOperatorList(equipment.getOrgId(), BusinessCodeConst.PCR0008);
                    if (CollectionUtil.isEmpty(userSelectors)) {
                        throw new JeecgBootException("未分配使用车间单位领导，无法进入下级审批！");
                    }
                    userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                    values.put("NextAssignee", userApprovalList);
                } else {
                    // 驳回
                    values.put("approvalDealType", request.getLeanOutConfirmDealType());
                }
                request.setComment("借用单位领导确认完成");
                break;
            case WAIT_CONFIRM_BORROW:
                // 借出方确认完成
                values.put("dataId", entity.getId());
                values.put("organization", request.getUseConfirmComment());
                values.put("comment", request.getUseConfirmComment());
                request.setComment("使用单位领导确认完成");
                break;
        }
        request.setValues(values);
    }


    @Override
    public void afterFlowHandle(FlowMyBusiness business) {
@@ -250,6 +491,30 @@
        business.getActStatus();
    }

    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());
    }

    @Override
    public Object getBusinessDataById(String dataId) {
        return this.getById(dataId);