qushaowei
2025-05-29 ba9c6723249f0a843d35eb21b43a00be4b7de3ab
备件请购
已修改8个文件
348 ■■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisition.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamSparePartRequisitionMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSparePartRequisitionMapper.xml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamSparePartRequisitionService.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSparePartRequisitionServiceImpl.java 224 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java
@@ -1,6 +1,8 @@
package org.jeecg.modules.eam.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -12,7 +14,10 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.entity.EamSparePartRequisition;
import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
import org.jeecg.modules.eam.request.EamSparePartRequisitionRequest;
import org.jeecg.modules.eam.service.IEamSparePartRequisitionService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -164,9 +169,47 @@
    @ApiOperation(value = "备件请购单-提交请购单", notes = "备件请购单-提交请购单")
    @PostMapping(value = "/submitSpareRequisition")
    public Result<?> submitSpareRequisition(@RequestBody EamSparePartRequisition eamSparePartRequisition) {
        eamSparePartRequisition.setRequisitionStatus(BusinessCodeConst.SPARE_REQUISITION_STATUS_2);
        eamSparePartRequisitionService.updateById(eamSparePartRequisition);
        return Result.OK("提交成功!");
//        eamSparePartRequisition.setRequisitionStatus(BusinessCodeConst.SPARE_REQUISITION_STATUS_2);
//        eamSparePartRequisitionService.updateById(eamSparePartRequisition);
        boolean b = eamSparePartRequisitionService.submitSpareRequisition(eamSparePartRequisition);
        if (!b) {
            return Result.error("提交失败!");
        }
        return Result.OK("提交成功!");
    }
    @GetMapping(value = "/getSparePartRequisitionList")
    public Result<?> getSparePartRequisitionList(EamSparePartRequisition eamSparePartRequisition,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<EamSparePartRequisition> queryWrapper = QueryGenerator.initQueryWrapper(eamSparePartRequisition, req.getParameterMap());
        Page<EamSparePartRequisition> page = new Page<EamSparePartRequisition>(pageNo, pageSize);
        IPage<EamSparePartRequisition> pageList = eamSparePartRequisitionService.page(page, queryWrapper);
        List<EamSparePartRequisition> records = pageList.getRecords();
        for (EamSparePartRequisition record : records) {
            String id = record.getId();
            List<Map<String, Object>> sparePartRequisitionDetailList = eamSparePartRequisitionService.getSparePartRequisitionDetailList(id);
            record.setSparePartRequisitionDetailList(sparePartRequisitionDetailList);
        }
        return Result.OK(pageList);
    }
    /**
     * 审核
     */
    @AutoLog(value = "备件请购-审批流")
    @ApiOperation(value = "备件请购-审批流", notes = "备件请购-审批流")
    @RequestMapping(value = "/approval", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> approval(@RequestBody EamSparePartRequisitionRequest request) {
        if (request == null) {
            return Result.error("添加的对象不能为空!");
        }
        EamSparePartRequisition entity = eamSparePartRequisitionService.approval(request);
        if (entity == null) {
            return Result.error("操作失败!");
        }
        return Result.OK("操作成功!");
    }
    /**
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSparePartRequisition.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -12,6 +13,9 @@
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * @Description: 备件请购单
@@ -70,4 +74,12 @@
    @Excel(name = "备注", width = 15)
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * 备件请购明细单
     */
    @TableField(exist = false)
    private List<Map<String, Object>> sparePartRequisitionDetailList;
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamSparePartRequisitionMapper.java
@@ -1,7 +1,14 @@
package org.jeecg.modules.eam.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EamSparePartRequisition;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.eam.entity.EamSparePartRequisitionDetail;
import java.util.List;
import java.util.Map;
/**
 * @Description: 备件请购单
@@ -11,4 +18,5 @@
 */
public interface EamSparePartRequisitionMapper extends BaseMapper<EamSparePartRequisition> {
    List<Map<String, Object>> getSparePartRequisitionDetailList(@Param(Constants.WRAPPER) Wrapper<EamSparePartRequisitionDetail> queryWrapper);
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSparePartRequisitionMapper.xml
@@ -2,4 +2,19 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamSparePartRequisitionMapper">
    <select id="getSparePartRequisitionDetailList" resultType="Map">
        SELECT
            t2.id,
            t2.part_code AS partCode,
            t2.part_name as partName,
            t2.part_model as partModel,
            t2.part_specification as partSpecification,
            t3.item_text as partCategory,
            t1.requisition_num as quantity
        FROM
            eam_spare_part_requisition_detail t1
            LEFT JOIN eam_spare_parts t2 ON t1.part_id = t2.id
            LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'spare_part_category' ) t3 ON t3.item_value = t2.part_category
        ${ew.customSqlSegment}
    </select>
</mapper>
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamSparePartRequisitionService.java
@@ -1,7 +1,13 @@
package org.jeecg.modules.eam.service;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.entity.EamSparePartRequisition;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
import org.jeecg.modules.eam.request.EamSparePartRequisitionRequest;
import java.util.List;
import java.util.Map;
/**
 * @Description: 备件请购单
@@ -11,4 +17,19 @@
 */
public interface IEamSparePartRequisitionService extends IService<EamSparePartRequisition> {
    /**
     * 备件请购单提交
     * @param eamSparePartRequisition
     * @return
     */
    boolean submitSpareRequisition(EamSparePartRequisition eamSparePartRequisition);
    List<Map<String, Object>> getSparePartRequisitionDetailList(String sparePartRequisitionId);
    /**
     * 审批流程控制
     * @param request
     * @return
     */
    EamSparePartRequisition approval(EamSparePartRequisitionRequest request);
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSparePartRequisitionServiceImpl.java
@@ -1,11 +1,44 @@
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.toolkit.Wrappers;
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.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.entity.EamSparePartRequisition;
import org.jeecg.modules.eam.entity.EamSparePartRequisitionDetail;
import org.jeecg.modules.eam.mapper.EamSparePartRequisitionMapper;
import org.jeecg.modules.eam.request.EamSparePartRequisitionRequest;
import org.jeecg.modules.eam.service.IEamSparePartRequisitionService;
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.service.ISysUserService;
import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
/**
 * @Description: 备件请购单
@@ -13,7 +46,194 @@
 * @Date: 2025-03-19
 * @Version: V1.0
 */
@Service
public class EamSparePartRequisitionServiceImpl extends ServiceImpl<EamSparePartRequisitionMapper, EamSparePartRequisition> implements IEamSparePartRequisitionService {
@Service("IEamSparePartRequisitionService")
public class EamSparePartRequisitionServiceImpl extends ServiceImpl<EamSparePartRequisitionMapper, EamSparePartRequisition> implements IEamSparePartRequisitionService, FlowCallBackServiceI {
    @Autowired
    private ISysUserService sysUserService;
    @Autowired
    private IFlowDefinitionService flowDefinitionService;
    @Autowired
    private FlowCommonService flowCommonService;
    @Resource
    private EamSparePartRequisitionMapper sparePartRequisitionMapper;
    @Autowired
    private IFlowMyBusinessService flowMyBusinessService;
    @Autowired
    private TaskService taskService;
    @Autowired
    private IFlowTaskService flowTaskService;
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean submitSpareRequisition(EamSparePartRequisition eamSparePartRequisition) {
        EamSparePartRequisition entity = super.getById(eamSparePartRequisition.getId());
        if (entity == null) {
            throw new JeecgBootException("要提交的数据不存在,请刷新重试!");
        }
        //执行完成
        List<UserSelector> userSelectors = sysUserService.selectOperatorList(BusinessCodeConst.PCR0007);
        if (CollectionUtil.isEmpty(userSelectors)) {
            throw new JeecgBootException("备件管理员未设置人员,无法进入下级审批!");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法提交备件请购单!");
        }
        UpdateWrapper<EamSparePartRequisition> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("requisition_status", BusinessCodeConst.SPARE_REQUISITION_STATUS_2);
        updateWrapper.eq("id", eamSparePartRequisition.getId());
//        boolean success = super.update(updateWrapper);
        //启动审批流程
        flowCommonService.initActBusiness("备件请购单号:" + entity.getRequisitionCode() + ";申请人: " + entity.getReportUser() + ";发起备件请购申请",
                                                entity.getId(),
                                 "IEamSparePartRequisitionService",
                              "spare_part_apply",
                                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 = new ArrayList<>();
        for (UserSelector userSelector : userSelectors) {
            usernames.add(userSelector.getUsername());
        }
        variables.put("NextAssignee", usernames);
        Result result = flowDefinitionService.startProcessInstanceByKey("spare_part_apply", variables);
        if (result != null) {
            super.update(updateWrapper);
            return result.isSuccess();
        }
        return false;
    }
    @Override
    public List<Map<String, Object>> getSparePartRequisitionDetailList(String sparePartRequisitionId) {
        QueryWrapper<EamSparePartRequisitionDetail> queryWrapper = Wrappers.query();
        if (sparePartRequisitionId != null && sparePartRequisitionId != "") {
            queryWrapper.eq("t1.spare_requisition_id", sparePartRequisitionId);
        }
        return this.baseMapper.getSparePartRequisitionDetailList(queryWrapper);
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public EamSparePartRequisition approval(EamSparePartRequisitionRequest request) {
        EamSparePartRequisition entity = sparePartRequisitionMapper.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("任务不存在、已完成或已被他人认领!");
        }
        //流程变量
        Map<String, Object> values = new HashMap<>();
        switch (BusinessCodeConst.SPARE_REQUISITION_STATUS_2) {
            // 审批
            case BusinessCodeConst.SPARE_REQUISITION_STATUS_2:
                //执行完成
                values.put("dataId", entity.getId());
                values.put("organization", "备件请购审批");
                values.put("comment", request.getComment());
                values.put("status", request.getStatus());
                request.setComment(request.getComment());
                entity.setApprovalUser(user.getUsername());// 审核人
                entity.setApprovalTime(new Date());// 审核时间
                entity.setRemark(request.getApprovalOpinion());// 审核意见
                // 验证通过还是驳回
                if (request.getStatus().equals("1")) {
                    //设置entity
                    entity.setRequisitionStatus(BusinessCodeConst.SPARE_REQUISITION_STATUS_3);
                    List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getReportUser()));
                    values.put("NextAssignee", userApprovalList);
                } else {
                    //设置entity
                    entity.setRequisitionStatus(BusinessCodeConst.SPARE_REQUISITION_STATUS_4);
                }
                break;
        }
        request.setValues(values);
        // 完成流程任务
        Result result = flowTaskService.complete(request);
        if (!result.isSuccess()) {
            throw new JeecgBootException("审批失败,请刷新查看!");
        }
        //保存工单
        sparePartRequisitionMapper.updateById(entity);
        return entity;
    }
    /**
     * 判断用户是否拥有此权限
     *
     * @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());
    }
    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;
    }
    @Override
    public void afterFlowHandle(FlowMyBusiness business) {
        business.getTaskNameId();//接下来审批的节点
        business.getValues();//前端传进来的参数
        business.getActStatus();
    }
    @Override
    public Object getBusinessDataById(String dataId) {
        return this.getById(dataId);
    }
    @Override
    public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
        return null;
    }
    @Override
    public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
        //业务是否干预流程,业务干预,流程干预,指定人员进行处理
        //获取下一步处理人
        Object object = values.get("NextAssignee");
        return (List<String>) object;
    }
}
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -332,6 +332,13 @@
    List<UserSelector> selectOperatorList(String equipmentCode, String productionId, String positionCode);
    /**
     * 选择用户
     * @param positionCode 岗位编号
     * @return
     */
    List<UserSelector> selectOperatorList( String positionCode);
    /**
     * 根据用户名批量获取真实姓名映射
     * @param userNames 用户名列表
     * @return 用户名->真实姓名的映射(不存在时值为null)
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -764,6 +764,18 @@
        return collect;
    }
    @Override
    public List<UserSelector> selectOperatorList(String positionCode) {
        LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(SysUser::getPost, positionCode);
        queryWrapper.eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0);
        queryWrapper.eq(SysUser::getStatus, CommonConstant.DEL_FLAG_1);
        queryWrapper.orderByDesc(SysUser::getId);
        List<SysUser> sysUsers = userMapper.selectList(queryWrapper);
        List<UserSelector> collect = sysUsers.stream().map(user -> new UserSelector(user.getId(), user.getUsername(), user.getRealname())).collect(Collectors.toList());
        return collect;
    }
    /**
     * 根据用户名批量获取真实姓名映射
     * @param userNames 用户名列表