From 8a6174c4cea6ef88a792e7d51273ef7dd88eca8a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 08 八月 2025 15:46:52 +0800
Subject: [PATCH] 调整查看详情
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 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 426a8d8..2c04224 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.approve.mapper.ApproveNodeMapper;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.pojo.ApproveProcess;
@@ -92,6 +93,12 @@
.collect(Collectors.toList())
.get(0)
.getNickName());
+ // 璁剧疆鐘舵�佷负閲嶆柊鎻愪氦
+ if(approveProcessVO.getId() != null){
+ ApproveProcess approveProcess1 = approveProcessMapper.selectById(approveProcessVO.getId());
+ approveProcess1.setApproveStatus(4);
+ approveProcessMapper.updateById(approveProcess1);
+ }
save(approveProcess);
//鍒濆鍖栧鎵硅妭鐐�
approveNodeService.initApproveNodes(approveProcessVO.getApproveUserIds(),approveID,approveProcessVO.getApproveDeptId());
@@ -132,30 +139,55 @@
LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ApproveProcess::getApproveId, id);
queryWrapper.eq(ApproveProcess::getApproveDelete, 0);
- return getOne(queryWrapper);
+ queryWrapper.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId());
+ queryWrapper.last("limit 1");
+ ApproveProcess one = getOne(queryWrapper);
+ return one;
}
- @Override
- public void updateApproveProcessStatus(ApproveNode approveNode) {
- ApproveProcess approveProcess = getById(approveNode.getApproveProcessId());
- if(approveNode.getIsFirst()){
- if(approveNode.getApproveNodeStatus() == 1){
- approveProcess.setApproveStatus(1);
- }
- }
- if(approveNode.getIsLast()){
- if(approveNode.getApproveNodeStatus() == 1){
- approveProcess.setApproveStatus(2);
- }
- }
+ private final ApproveNodeMapper approveNodeMapper;
- }
@Override
public void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) {
- ApproveProcess approve = getApproveById(approveGetAndUpdateVo.getId());
+ ApproveProcess approve = approveProcessMapper.selectById(approveGetAndUpdateVo.getId());
+ approve.setApproveUserIds(approveGetAndUpdateVo.getApproveUserIds());
approve.setApproveReason(approveGetAndUpdateVo.getApproveReason());
+ SysUser sysUser = sysUserMapper.selectUserById(approveGetAndUpdateVo.getApproveUser());
+ String[] split = approveGetAndUpdateVo.getApproveUserIds().split(",");
+ if(split.length == 0){
+ throw new RuntimeException("璇烽�夋嫨瀹℃壒浜�");
+ }
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(Arrays.asList(split).stream().map(Long::parseLong).collect(Collectors.toList()));
+ if(CollectionUtils.isEmpty(sysUsers)) throw new RuntimeException("璇烽�夋嫨瀹℃壒浜�");
+ if(sysUser == null) throw new RuntimeException("鐢宠浜轰笉瀛樺湪");
+ approve.setApproveUserName(sysUser.getNickName());
+ approve.setApproveUser(sysUser.getUserId());
+ //瀹℃牳涓笉鍙互缂栬緫瀹℃牳浜�
+ if(approve.getApproveStatus() != 1){
+ approve.setApproveUserCurrentId(Long.parseLong(split[0]));
+ approve.setApproveUserCurrentName(sysUsers.stream().filter(user -> user.getUserId().equals(Long.parseLong(split[0]))).collect(Collectors.toList()).get(0).getNickName());
+ }
updateById(approve);
+ //淇敼瀹℃壒浜�
+ LambdaQueryWrapper<ApproveNode> approveNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approve.getApproveId())
+ .eq(ApproveNode::getDeleteFlag, 0)
+ .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
+ .orderByAsc(ApproveNode::getApproveNodeOrder);
+ List<ApproveNode> list = approveNodeMapper.selectList(approveNodeLambdaQueryWrapper);
+ int i = 0;
+ for (ApproveNode approveNode : list) {
+ int finalI = i;
+ List<SysUser> collect = sysUsers.stream().filter(user -> user.getUserId().equals(Long.parseLong(split[finalI]))).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(collect)){
+ throw new RuntimeException("璇烽�夋嫨姝ｇ‘鐨勫鎵逛汉");
+ }
+ approveNode.setApproveNodeUserId(collect.get(0).getUserId());
+ approveNode.setApproveNodeUser(collect.get(0).getNickName());
+ approveNodeMapper.updateById(approveNode);
+ i++;
+ }
}
--
Gitblit v1.9.3