mitao
1 天以前 bb5ce8ef60a63815f222716c40111bd045464689
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationAssetServiceImpl.java
@@ -65,10 +65,8 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void submitReceiveBorrow(OaApprovalApplicationAssetReceiveDTO dto) {
        if (CollUtil.isEmpty(dto.getAssetMainIds())) {
            throw new ServiceException("资产ID列表不能为空");
        }
        validateAssetStatus(dto.getAssetMainIds());
        //校验资产状态
        oaApprovalApplicationAssetItemService.validateAssetStatus(dto.getAssetMainIds());
        // 1. 构建并保存审批主表
        OaApprovalApplications applications = buildOaApprovalApplications(dto);
@@ -95,11 +93,6 @@
                })
                .collect(Collectors.toList());
        oaApprovalApplicationAssetItemService.saveBatch(items);
    }
    //TODO 是否需要限制只有未提交审批的资产才能提交
    private void validateAssetStatus(List<Integer> assetMainIds) {
    }
    private OaApprovalFlowNode getFirstFlowNode(Integer approvalId) {
@@ -260,9 +253,8 @@
    }
    @Override
    public void submitReturn(OaApprovalApplicationAssetReturnDTO dto) {
        if (CollUtil.isEmpty(dto.getAssetMainIds())) {
            throw new ServiceException("资产ID列表不能为空");
        }
        //校验资产状态
        oaApprovalApplicationAssetItemService.validateAssetStatus(dto.getAssetMainIds());
        // 1. 构建并保存审批主表
        OaApprovalApplications applications = BeanUtil.copyProperties(dto, OaApprovalApplications.class);
        applications.setApplicationCode(generateApplicationCode("GH"));