From bd9b6a58beb6b478ad27d645aa1cc0da99c25d7d Mon Sep 17 00:00:00 2001
From: 青城 <1662047068@qq.com>
Date: 星期三, 09 七月 2025 18:02:37 +0800
Subject: [PATCH] 协调审批
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 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 322a498..a07be20 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.approve.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveNode;
@@ -9,10 +11,13 @@
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.utils.DailyRedisCounter;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
+import com.ruoyi.approve.vo.ApproveNodeVo;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +28,7 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -37,6 +43,8 @@
private final SysDeptMapper sysDeptMapper;
private final IApproveNodeService approveNodeService;
+ private final SysUserMapper sysUserMapper;
+ private final ApproveProcessMapper approveProcessMapper;
@Override
public void addApprove(ApproveProcessVO approveProcessVO) {
@@ -50,11 +58,21 @@
//娴佺▼ ID
String approveID = today + formattedCount;
+ //瀹℃壒浜哄鍚嶅鐞�
+ String approverIds = approveProcessVO.getApproverIds();
+ String[] idArray = approverIds.split(",");
+ String approverNames = getApproverNames(approveProcessVO.getApproverIds());
+ String[] namdArray = approverIds.split(",");
+
ApproveProcess approveProcess = new ApproveProcess();
approveProcess.setApproveId(approveID);
approveProcess.setApproveUser(userId);
- approveProcess.setApproveDeptName(approveProcessVO.getDeptName());
- approveProcess.setApproveUserNames(approveProcessVO.getApproverNames());
+ approveProcess.setApproveDeptId(approveProcessVO.getApproveDeptId());
+ // approveProcess.setApproveDeptName(approveProcessVO.getDeptName());
+ approveProcess.setApproveUserIds(approveProcessVO.getApproverIds());
+ approveProcess.setApproveUserNames(approverNames);
+ approveProcess.setApproveUserCurrentId(Long.parseLong(idArray[0]));
+ approveProcess.setApproveUserCurrentName(namdArray[0]);
approveProcess.setApproveTime(new Date());
approveProcess.setApproveReason(approveProcessVO.getApproveReason());
approveProcess.setApproveOverTime(null);
@@ -67,6 +85,22 @@
approveNodeService.initApproveNodes(approveID);
}
+ private String getApproverNames(String approverIds) {
+ String[] idArray = approverIds.split(",");
+
+ Integer[] ids = Arrays.stream(idArray)
+ .map(Integer::parseInt)
+ .toArray(Integer[]::new);
+ String names = "";
+ StringBuilder stringBuilder = new StringBuilder();
+ for (Integer id : ids) {
+ SysUser sysUser = sysUserMapper.selectUserById(id.longValue());
+ names = stringBuilder + "," + sysUser.getUserName();
+ }
+ return names;
+ }
+
+
@Override
public List<SysDept> selectDeptListByDeptIds(Long[] deptIds) {
List<SysDept> sysDeptList =new ArrayList<SysDept>();
@@ -78,17 +112,17 @@
}
@Override
- public List<ApproveProcess> listAll() {
+ public IPage<ApproveProcess> listAll(Page page) {
LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ApproveProcess::getApproveDelete, 0);
- return list(queryWrapper);
+ return approveProcessMapper.selectPage(page, queryWrapper);
}
@Override
public void delApprove(Long[] ids) {
for (Long id : ids) {
LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ApproveProcess::getApproveId, id);
+ queryWrapper.eq(ApproveProcess::getApproveDelete, 1);
update(queryWrapper);
}
}
@@ -102,18 +136,28 @@
}
@Override
- public void updateApproveProcessStatus(ApproveNode approveNode) {
- ApproveProcess approveProcess = getById(approveNode.getApproveProcessId());
- if(approveNode.getIsFirst()){
- if(approveNode.getApproveNodeStatus() == 1){
+ public void updateApproveProcessStatus(ApproveNodeVo approveNodeVo) {
+ ApproveNode node = approveNodeService.getById(approveNodeVo.getId());
+ ApproveProcess approveProcess = getById(node.getApproveProcessId());
+
+ String[] idArray = approveProcess.getApproveUserIds().split(",");
+ String[] nameArray = approveProcess.getApproveUserNames().split(",");
+
+ Integer noderOrder = approveNodeVo.getApproveNodeOrder();
+ approveProcess.setApproveUserCurrentId(Long.parseLong(idArray[noderOrder]));
+ approveProcess.setApproveUserCurrentName(nameArray[noderOrder]);
+
+ if(noderOrder.equals(1)){
+ if(approveNodeVo.getApproveNodeStatus() == 1){
approveProcess.setApproveStatus(1);
}
}
- if(approveNode.getIsLast()){
- if(approveNode.getApproveNodeStatus() == 1){
+ if(noderOrder.equals(idArray.length)){
+ if(approveNodeVo.getApproveNodeStatus() == 1){
approveProcess.setApproveStatus(2);
}
}
+ updateById(approveProcess);
}
--
Gitblit v1.9.3