liyong
5 天以前 0594e539cbe8ac734377f148a87eb7812255ddc0
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -89,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","SP");
        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(",")));
@@ -293,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) {
@@ -433,6 +445,8 @@
                return "发货审批";
            case 8:
                return "危险作业审批";
            case 10:
                return "销售审批";
        }
        return null;
    }