审批代码迁移, 销售台账审批添加

liyong

6 天以前 0594e539cbe8ac734377f148a87eb7812255ddc0

 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java

@@ -65,7 +65,6 @@
    private final ShippingInfoMapper shippingInfoMapper;
    private final ApproveNodeMapper approveNodeMapper;
    private final ApproveProcessConfigNodeService approveProcessConfigNodeService;
    private final FileUtil fileUtil;
    private final ApproveProcessConfigNodeMapper approveProcessConfigNodeMapper;

    @Override
@@ -73,6 +72,9 @@
        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
        SysDept sysDept = sysDeptMapper.selectDeptById(SecurityUtils.getLoginUser().getCurrentDeptId());
        List<ApproveProcessConfigNodeVo> list = approveProcessConfigNodeService.listNode( approveProcessVO.getApproveType());
        if(list.isEmpty()) {
            throw new RuntimeException("流程不存在");
        }
        List<Long> nodeIds = list.stream()
                .map(ApproveProcessConfigNodeVo::getApproverId)
                .collect(Collectors.toList());
@@ -87,11 +89,12 @@
//        String approveID = today + formattedCount;
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
        ApproveProcess approveProcess = new ApproveProcess();
        String no = OrderUtils.countTodayByCreateTime(approveProcessMapper, "","approve_id");
        String no = OrderUtils.countTodayByCreateTime(approveProcessMapper, "SP","approve_id");
        approveProcess.setApproveId(no);
        approveProcess.setApproveUser(sysUser.getUserId());
        approveProcess.setApproveUserName(sysUser.getNickName());
        approveProcess.setApproveDeptId(sysDept.getDeptId());
        approveProcess.setRecordId(approveProcessVO.getRecordId());
        approveProcess.setApproveUserIds(nodeIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
        approveProcess.setApproveDeptName(sysDept.getDeptName());
        approveProcess.setApproveUserNames(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
@@ -153,12 +156,13 @@
        return sysDeptList;
    }

    @Override
    public IPage<ApproveProcessVo> listAll(Page page, ApproveProcess approveProcess) {
        IPage<ApproveProcessVo> approveProcessIPage = approveProcessMapper.listPage(page, approveProcess);
        List<ApproveProcessVo> records = approveProcessIPage.getRecords();

        for (ApproveProcessVo record : records) {
    @Override
    public IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess) {
        IPage<ApproveProcess> approveProcessIPage = approveProcessMapper.listPage(page, approveProcess);
        List<ApproveProcess> records = approveProcessIPage.getRecords();

        for (ApproveProcess record : records) {
            List<CommonFile> allFiles = new ArrayList<>();

            //  采购审批查询
@@ -202,7 +206,6 @@
            }

            record.setCommonFileList(allFiles);
            record.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.APPROVE_PROCESS, record.getId()));
        }
        return approveProcessIPage;
    }
@@ -291,6 +294,17 @@
        return one;
    }

    @Override
    public void deleteByRecordId(Long recordId) {
        LambdaQueryWrapper<ApproveProcess> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(ApproveProcess::getRecordId, recordId)
                .eq(ApproveProcess::getApproveType, 6);
        List<ApproveProcess> approveProcess = list(wrapper);
        if (approveProcess != null) {
            approveProcess.forEach(p -> this.removeById(p.getId()));
        }
    }


    // 报价审批编辑审核人
    public void updateApproveUser(ApproveGetAndUpdateVo approveGetAndUpdateVo) {
@@ -299,7 +313,6 @@
                .eq(ApproveProcess::getApproveReason, approveGetAndUpdateVo.getApproveReason())
                .last("limit 1");
        ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);

        if (approveProcess == null) throw new RuntimeException("请选择审批人");
        //查询审批配置
        List<ApproveProcessConfigNode> approveProcessConfig = approveProcessConfigNodeMapper.selectList(new LambdaQueryWrapper<ApproveProcessConfigNode>().eq(ApproveProcessConfigNode::getApproveType, approveGetAndUpdateVo.getApproveType()));
@@ -432,6 +445,8 @@
                return "发货审批";
            case 8:
                return "危险作业审批";
            case 10:
                return "销售审批";
        }
        return null;
    }