From 3675f944d84312ea9850a35eb2294c2b751c1451 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 26 五月 2026 16:23:19 +0800
Subject: [PATCH] feat(approve): 更新审批流程配置节点查询逻辑
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
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 0ad488b..f5b9aba 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/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
@@ -87,7 +86,7 @@
// 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, "approve_id","SP");
approveProcess.setApproveId(no);
approveProcess.setApproveUser(sysUser.getUserId());
approveProcess.setApproveUserName(sysUser.getNickName());
@@ -153,12 +152,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 +202,6 @@
}
record.setCommonFileList(allFiles);
- record.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.APPROVE_PROCESS, record.getId()));
}
return approveProcessIPage;
}
@@ -299,7 +298,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()));
--
Gitblit v1.9.3