From ccf8e35d90bcfe06d9c28af3029c806d1ceb1b11 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 14 七月 2025 15:57:43 +0800
Subject: [PATCH] yys 修改bug
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 124 +++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 35 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..659f4aa 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -1,7 +1,11 @@
package com.ruoyi.approve.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+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;
@@ -12,19 +16,28 @@
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;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
@@ -37,34 +50,58 @@
private final SysDeptMapper sysDeptMapper;
private final IApproveNodeService approveNodeService;
+ private final SysUserMapper sysUserMapper;
+ private final ApproveProcessMapper approveProcessMapper;
@Override
- public void addApprove(ApproveProcessVO approveProcessVO) {
- Long userId = SecurityUtils.getUserId();
- //绉熸埛id
- Long tenantId = SecurityUtils.getLoginUser().getTenantId();
-
+ public void addApprove(ApproveProcessVO approveProcessVO) throws ParseException {
+ SysUser sysUser = sysUserMapper.selectUserById(approveProcessVO.getApproveUser());
+ SysDept sysDept = sysDeptMapper.selectDeptById(approveProcessVO.getApproveDeptId());
+ String[] split = approveProcessVO.getApproveUserIds().split(",");
+ List<Long> longList = Arrays.stream(split)
+ .map(Long::valueOf) // 灏嗘瘡涓� String 杞崲涓� Long
+ .collect(Collectors.toList());
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(longList);
+ if(CollectionUtils.isEmpty(sysUsers)) throw new RuntimeException("瀹℃牳鐢ㄦ埛涓嶅瓨鍦�");
+ if(sysDept == null) throw new RuntimeException("閮ㄩ棬涓嶅瓨鍦�");
+ if(sysUser == null) throw new RuntimeException("鐢宠浜轰笉瀛樺湪");
String today = LocalDate.now().format(DATE_FORMAT);
- Long approveId = dailyRedisCounter.incrementAndGet("approveId");
+ Long approveId = dailyRedisCounter.incrementAndGetByDb();
String formattedCount = String.format("%03d", approveId);
//娴佺▼ ID
String approveID = today + formattedCount;
-
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
ApproveProcess approveProcess = new ApproveProcess();
approveProcess.setApproveId(approveID);
- approveProcess.setApproveUser(userId);
- approveProcess.setApproveDeptName(approveProcessVO.getDeptName());
- approveProcess.setApproveUserNames(approveProcessVO.getApproverNames());
- approveProcess.setApproveTime(new Date());
+ approveProcess.setApproveUser(approveProcessVO.getApproveUser());
+ approveProcess.setApproveUserName(sysUser.getNickName());
+ approveProcess.setApproveDeptId(approveProcessVO.getApproveDeptId());
+ approveProcess.setApproveDeptName(sysDept.getDeptName());
+ approveProcess.setApproveUserNames(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
+ approveProcess.setApproveTime(StringUtils.isEmpty(approveProcessVO.getApproveTime()) ? null : dateFormat.parse(approveProcessVO.getApproveTime()));
approveProcess.setApproveReason(approveProcessVO.getApproveReason());
approveProcess.setApproveOverTime(null);
approveProcess.setApproveStatus(0);
approveProcess.setApproveDelete(0);
- approveProcess.setTenantId(tenantId);
-
+ approveProcess.setCreateTime(LocalDateTime.now());
+ approveProcess.setTenantId(approveProcessVO.getApproveDeptId());
+ approveProcess.setApproveUserIds(approveProcessVO.getApproveUserIds());
+ approveProcess.setApproveUserCurrentId(longList.get(0));
+ approveProcess.setApproveUserCurrentName(sysUsers
+ .stream()
+ .filter(SysUser -> SysUser.getUserId().equals(longList.get(0)))
+ .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(approveID);
+ approveNodeService.initApproveNodes(approveProcessVO.getApproveUserIds(),approveID,approveProcessVO.getApproveDeptId());
}
@Override
@@ -78,19 +115,23 @@
}
@Override
- public List<ApproveProcess> listAll() {
- LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ApproveProcess::getApproveDelete, 0);
- return list(queryWrapper);
+ public IPage<ApproveProcess> listAll(Page page,ApproveProcess approveProcess) {
+ IPage<ApproveProcess> approveProcessIPage = approveProcessMapper.listPage(page,approveProcess);
+ return approveProcessIPage;
}
@Override
public void delApprove(Long[] ids) {
for (Long id : ids) {
- LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ApproveProcess::getApproveId, id);
+ UpdateWrapper<ApproveProcess> queryWrapper = new UpdateWrapper<>();
+ queryWrapper.lambda().set(ApproveProcess::getApproveDelete, 1)
+ .eq(ApproveProcess::getApproveId, id);
update(queryWrapper);
+ // 鍒犻櫎鍏宠仈鐨勫鎵硅妭鐐�
+ approveNodeService.delApproveNodeByApproveId(id);
}
+
+
}
@Override
@@ -98,28 +139,41 @@
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 updateApproveProcessStatus(ApproveNode approveNode,Integer status) {
+ LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, approveNode.getApproveProcessId())
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId())
+ .last("limit 1");
+ ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
+ if(approveProcess == null) throw new RuntimeException("瀹℃壒涓嶅瓨鍦�");
+ LambdaQueryWrapper<ApproveNode> approveNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveNode.getApproveProcessId())
+ .eq(ApproveNode::getApproveNodeOrder, approveNode.getApproveNodeOrder() + 1)
+ .eq(ApproveNode::getDeleteFlag, 0)
+ .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
+ .last("limit 1");
+ ApproveNode approveNode1 = approveNodeMapper.selectOne(approveNodeLambdaQueryWrapper);
+ approveProcess.setApproveStatus(status);
+ if(approveNode1 != null){
+ approveProcess.setApproveUserCurrentId(approveNode.getApproveNodeUserId());
+ approveProcess.setApproveUserCurrentName(approveNode1.getApproveNodeUser());
+ }
+ updateById(approveProcess);
}
@Override
public void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) {
- ApproveProcess approve = getApproveById(approveGetAndUpdateVo.getId());
+ ApproveProcess approve = approveProcessMapper.selectById(approveGetAndUpdateVo.getId());
approve.setApproveReason(approveGetAndUpdateVo.getApproveReason());
updateById(approve);
}
--
Gitblit v1.9.3