fix: 审批管理附件问题修复

buhuazhen

7 天以前 ab1a58211470fcc2b93e3b5082e516409c79e11b

fix: 审批管理附件问题修复

 src/main/java/com/ruoyi/approve/bean/dto/ApprovalTemplateDto.java

@@ -1,6 +1,7 @@
package com.ruoyi.approve.bean.dto;

import com.ruoyi.approve.pojo.ApprovalTemplate;
import com.ruoyi.basic.dto.StorageBlobDTO;
import lombok.Data;

import java.util.List;
@@ -9,4 +10,6 @@
public class ApprovalTemplateDto  extends ApprovalTemplate {

    private List<ApprovalTemplateNodeDto> nodes;

    private List<StorageBlobDTO> storageBlobDTOs;
}

 src/main/java/com/ruoyi/approve/bean/vo/ApprovalTemplateVo.java

@@ -1,6 +1,7 @@
package com.ruoyi.approve.bean.vo;

import com.ruoyi.approve.pojo.ApprovalTemplate;
import com.ruoyi.basic.dto.StorageBlobVO;
import lombok.Data;

import java.util.List;
@@ -11,4 +12,6 @@
    private List<ApprovalTemplateNodeVo> nodes;

    private String createdUserName;

    private List<StorageBlobVO> storageBlobDTOs;
}

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

@@ -18,10 +18,15 @@
import com.ruoyi.approve.pojo.ApprovalTemplateNodeApprover;
import com.ruoyi.approve.service.ApprovalTemplateNodeService;
import com.ruoyi.approve.service.ApprovalTemplateService;
import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.basic.enums.ApplicationTypeEnum;
import com.ruoyi.basic.enums.RecordTypeEnum;
import com.ruoyi.basic.utils.FileUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.util.Collections;
import java.util.Comparator;
@@ -43,6 +48,7 @@
    private final ApprovalTemplateMapper approvalTemplateMapper;
    private final ApprovalTemplateNodeService approvalTemplateNodeService;
    private final ApprovalTemplateNodeApproverMapper approvalTemplateNodeApproverMapper;
    private final FileUtil fileUtil;

    @Override
    public IPage<ApprovalTemplateVo> listPage(Page<ApprovalTemplateVo> page, ApprovalTemplateDto approvalTemplateDto) {
@@ -63,6 +69,11 @@
                new LambdaQueryWrapper<ApprovalTemplateNodeApprover>()
                        .eq(ApprovalTemplateNodeApprover::getTemplateId, approvalTemplateDto.getId())
        );
        // 保存附件
        List<StorageBlobDTO> storageBlobDTOs = approvalTemplateDto.getStorageBlobDTOs();
        if (!CollectionUtils.isEmpty(storageBlobDTOs)) {
            fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE, RecordTypeEnum.APPROVAL_TEMPLATE, approvalTemplateDto.getId(), storageBlobDTOs);
        }
        return approvalTemplateNodeService.saveApprovalTemplateNode(
                approvalTemplateDto.getId(),
                approvalTemplateDto.getNodes()
@@ -80,6 +91,16 @@
                new LambdaQueryWrapper<ApprovalTemplateNodeApprover>()
                        .eq(ApprovalTemplateNodeApprover::getTemplateId, approvalTemplateDto.getId())
        );
        // 保存附件（会先删除旧附件）
        List<StorageBlobDTO> storageBlobDTOs = approvalTemplateDto.getStorageBlobDTOs();
        if (!CollectionUtils.isEmpty(storageBlobDTOs)) {
            fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE, RecordTypeEnum.APPROVAL_TEMPLATE, approvalTemplateDto.getId(), storageBlobDTOs);
        } else {
            // 如果前端传空数组，删除旧附件
            fileUtil.deleteStorageAttachmentsByApplicationAndRecordTypeAndRecordId(
                    ApplicationTypeEnum.FILE, RecordTypeEnum.APPROVAL_TEMPLATE, approvalTemplateDto.getId()
            );
        }
        return approvalTemplateNodeService.saveApprovalTemplateNode(
                approvalTemplateDto.getId(),
                approvalTemplateDto.getNodes()
@@ -221,6 +242,12 @@
                .collect(Collectors.toList());

        templateVo.setNodes(nodeVos);
        // 查询附件
        templateVo.setStorageBlobDTOs(
                fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(
                        ApplicationTypeEnum.FILE, RecordTypeEnum.APPROVAL_TEMPLATE, template.getId()
                )
        );
        return templateVo;
    }


 src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java

@@ -201,7 +201,8 @@
    ENTERPRISE_NEWS("enterprise_news"),
    APPROVAL_INSTANCE("approval_instance"),
    ACCOUNT_INVOICE_APPLICATION("account_invoice_application"),
    ACCOUNT_PURCHASE_INVOICE("account_purchase_invoice");
    ACCOUNT_PURCHASE_INVOICE("account_purchase_invoice"),
    APPROVAL_TEMPLATE("approval_template");

    private final String type;
    RecordTypeEnum(String type) { this.type = type; }