From c9e784140d837cb27a4f93935b08bbb739d47c8e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 13 八月 2025 17:08:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 15 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 b081070..06c9562 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;
@@ -13,11 +14,15 @@
import com.ruoyi.approve.utils.DailyRedisCounter;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.vo.ApproveProcessVO;
+import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.other.service.impl.TempFileServiceImpl;
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 com.ruoyi.sales.mapper.CommonFileMapper;
+import com.ruoyi.sales.pojo.CommonFile;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +32,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
+import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -51,9 +57,11 @@
private final IApproveNodeService approveNodeService;
private final SysUserMapper sysUserMapper;
private final ApproveProcessMapper approveProcessMapper;
+ private final TempFileServiceImpl tempFileService;
+ private final CommonFileMapper commonFileMapper;
@Override
- public void addApprove(ApproveProcessVO approveProcessVO) throws ParseException {
+ public void addApprove(ApproveProcessVO approveProcessVO) throws Exception {
SysUser sysUser = sysUserMapper.selectUserById(approveProcessVO.getApproveUser());
SysDept sysDept = sysDeptMapper.selectDeptById(approveProcessVO.getApproveDeptId());
String[] split = approveProcessVO.getApproveUserIds().split(",");
@@ -82,6 +90,7 @@
approveProcess.setApproveOverTime(null);
approveProcess.setApproveStatus(0);
approveProcess.setApproveDelete(0);
+ approveProcess.setApproveType(approveProcessVO.getApproveType());
approveProcess.setCreateTime(LocalDateTime.now());
approveProcess.setTenantId(approveProcessVO.getApproveDeptId());
approveProcess.setApproveUserIds(approveProcessVO.getApproveUserIds());
@@ -92,9 +101,17 @@
.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());
+ // 闄勪欢缁戝畾
+ tempFileService.migrateTempFilesToFormal(approveProcess.getId(), approveProcessVO.getTempFileIds(), FileNameType.ApproveProcess.getValue());
}
@Override
@@ -110,6 +127,13 @@
@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> commonFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, record.getId())
+ .eq(CommonFile::getType, FileNameType.ApproveProcess.getValue()));
+ record.setCommonFileList(commonFiles);
+ }
return approveProcessIPage;
}
@@ -135,27 +159,56 @@
queryWrapper.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId());
queryWrapper.last("limit 1");
ApproveProcess one = getOne(queryWrapper);
+ one.setCommonFileList(commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, one.getId())
+ .eq(CommonFile::getType, FileNameType.ApproveProcess.getValue())));
return one;
}
- @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("瀹℃壒涓嶅瓨鍦�");
- approveProcess.setApproveStatus(status);
- updateById(approveProcess);
- }
+ private final ApproveNodeMapper approveNodeMapper;
+
@Override
- public void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) {
- ApproveProcess approve = getApproveById(approveGetAndUpdateVo.getId());
+ public void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
+ 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++;
+ }
+ tempFileService.migrateTempFilesToFormal(approve.getId(), approveGetAndUpdateVo.getTempFileIds(), FileNameType.ApproveProcess.getValue());
}
--
Gitblit v1.9.3