From 2a71f6790ddf6be7f63e6b009fc8d325a2a1d13b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 27 四月 2026 13:07:34 +0800
Subject: [PATCH] 添加相关接口附件信息
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 14 ++++++++++----
src/main/java/com/ruoyi/approve/mapper/ApproveProcessMapper.java | 3 ++-
src/main/java/com/ruoyi/approve/service/IApproveProcessService.java | 3 ++-
src/main/java/com/ruoyi/approve/vo/ApproveProcessVo.java | 12 ++++++++++++
src/main/resources/mapper/approve/ApproveProcessMapper.xml | 2 +-
src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java | 1 +
6 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/mapper/ApproveProcessMapper.java b/src/main/java/com/ruoyi/approve/mapper/ApproveProcessMapper.java
index bddde19..513926f 100644
--- a/src/main/java/com/ruoyi/approve/mapper/ApproveProcessMapper.java
+++ b/src/main/java/com/ruoyi/approve/mapper/ApproveProcessMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.approve.vo.ApproveProcessVo;
import com.ruoyi.approve.pojo.ApproveProcess;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -16,7 +17,7 @@
@Mapper
public interface ApproveProcessMapper extends BaseMapper<ApproveProcess> {
- IPage<ApproveProcess> listPage(Page page,@Param("req") ApproveProcess approveProcess);
+ IPage<ApproveProcessVo> listPage(Page page, @Param("req") ApproveProcess approveProcess);
}
diff --git a/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java b/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
index a71cb90..49b3508 100644
--- a/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
+++ b/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.approve.vo.ApproveProcessVo;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.bean.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
@@ -23,7 +24,7 @@
*/
List<SysDept> selectDeptListByDeptIds(Long[] deptIds);
- IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess);
+ IPage<ApproveProcessVo> listAll(Page page, ApproveProcess approveProcess);
void delApprove(List<Long> ids);
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 3a81f0a..3143391 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.approve.vo.ApproveProcessVo;
import com.ruoyi.approve.bean.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.bean.vo.ApproveProcessConfigNodeVo;
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
@@ -16,6 +17,9 @@
import com.ruoyi.approve.service.ApproveProcessConfigNodeService;
import com.ruoyi.approve.service.IApproveNodeService;
import com.ruoyi.approve.service.IApproveProcessService;
+import com.ruoyi.basic.enums.ApplicationTypeEnum;
+import com.ruoyi.basic.enums.RecordTypeEnum;
+import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -63,6 +67,7 @@
private final ShippingInfoMapper shippingInfoMapper;
private final ApproveNodeMapper approveNodeMapper;
private final ApproveProcessConfigNodeService approveProcessConfigNodeService;
+ private final FileUtil fileUtil;
@Override
public void addApprove(ApproveProcessVO approveProcessVO) throws Exception {
@@ -150,11 +155,11 @@
}
@Override
- public IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess) {
- IPage<ApproveProcess> approveProcessIPage = approveProcessMapper.listPage(page, approveProcess);
- List<ApproveProcess> records = approveProcessIPage.getRecords();
+ public IPage<ApproveProcessVo> listAll(Page page, ApproveProcess approveProcess) {
+ IPage<ApproveProcessVo> approveProcessIPage = approveProcessMapper.listPage(page, approveProcess);
+ List<ApproveProcessVo> records = approveProcessIPage.getRecords();
- for (ApproveProcess record : records) {
+ for (ApproveProcessVo record : records) {
List<CommonFile> allFiles = new ArrayList<>();
// 閲囪喘瀹℃壒鏌ヨ
@@ -198,6 +203,7 @@
}
record.setCommonFileList(allFiles);
+ record.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.APPROVE_PROCESS, record.getId()));
}
return approveProcessIPage;
}
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVo.java b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVo.java
new file mode 100644
index 0000000..f3778b6
--- /dev/null
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVo.java
@@ -0,0 +1,12 @@
+package com.ruoyi.approve.vo;
+
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.basic.dto.StorageBlobVO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApproveProcessVo extends ApproveProcess {
+ private List<StorageBlobVO> storageBlobVOs;
+}
diff --git a/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java b/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
index 4a72d52..d7d0649 100644
--- a/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
+++ b/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
@@ -193,6 +193,7 @@
KNOWLEDGE_BASE("knowledge_base"),
NOTIFICATION_MANAGEMENT("notification_management"),
APPROVE_NODE("approve_node"),
+ APPROVE_PROCESS("approve_process"),
APPROVE_PROCESS_CONFIG_NODE("approve_process_config_node"),
APPROVE_LOG("approve_log"),
ANNUAL_LEAVE_SETTING("annual_leave_setting"),
diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index 33b29a9..fef06f7 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -27,7 +27,7 @@
approve_user_names,approve_reason,approve_time,approve_over_time,approve_status,
approve_delete,tenant_id,approve_type,approve_remark
</sql>
- <select id="listPage" resultType="com.ruoyi.approve.pojo.ApproveProcess">
+ <select id="listPage" resultType="com.ruoyi.approve.vo.ApproveProcessVo">
select * from approve_process where approve_delete = 0
<if test="req.approveId != null and req.approveId != ''">
and approve_id like concat('%',#{req.approveId},'%')
--
Gitblit v1.9.3