From 68d4b9484a3d1874703d79d87f8015998213d9a8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 12 一月 2026 14:35:00 +0800
Subject: [PATCH] 消息通知与协同审批联动
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 70 ++++++++++++++++++++++++++++------
1 files changed, 57 insertions(+), 13 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 06c9562..e7478a9 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -15,16 +15,19 @@
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.common.enums.FileNameType;
+import com.ruoyi.common.utils.OrderUtils;
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.project.system.service.ISysNoticeService;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.pojo.CommonFile;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -59,6 +62,7 @@
private final ApproveProcessMapper approveProcessMapper;
private final TempFileServiceImpl tempFileService;
private final CommonFileMapper commonFileMapper;
+ private final ISysNoticeService sysNoticeService;
@Override
public void addApprove(ApproveProcessVO approveProcessVO) throws Exception {
@@ -87,6 +91,8 @@
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.setDeviceRepairId(approveProcessVO.getDeviceRepairId());
+ approveProcess.setMaintenancePrice(approveProcessVO.getMaintenancePrice());
approveProcess.setApproveOverTime(null);
approveProcess.setApproveStatus(0);
approveProcess.setApproveDelete(0);
@@ -112,6 +118,13 @@
approveNodeService.initApproveNodes(approveProcessVO.getApproveUserIds(),approveID,approveProcessVO.getApproveDeptId());
// 闄勪欢缁戝畾
tempFileService.migrateTempFilesToFormal(approveProcess.getId(), approveProcessVO.getTempFileIds(), FileNameType.ApproveProcess.getValue());
+ /*娑堟伅閫氱煡*/
+ String id = approveProcessVO.getApproveUserIds().split(",")[0];
+ sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcessVO.getApproveType()),
+ approveID+"娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
+ Arrays.asList(Long.valueOf(id)),
+ approveProcessVO.getApproveDeptId(),
+ "/collaborativeApproval/approvalProcess?approveType="+approveProcessVO.getApproveType()+"&approveId="+approveID);
}
@Override
@@ -171,6 +184,7 @@
@Override
public void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
ApproveProcess approve = approveProcessMapper.selectById(approveGetAndUpdateVo.getId());
+ BeanUtils.copyProperties(approveGetAndUpdateVo, approve);
approve.setApproveUserIds(approveGetAndUpdateVo.getApproveUserIds());
approve.setApproveReason(approveGetAndUpdateVo.getApproveReason());
SysUser sysUser = sysUserMapper.selectUserById(approveGetAndUpdateVo.getApproveUser());
@@ -190,26 +204,56 @@
}
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++;
- }
+ approveNodeMapper.delete(approveNodeLambdaQueryWrapper);
+ approveNodeService.initApproveNodes(approveGetAndUpdateVo.getApproveUserIds(),approve.getApproveId(),approve.getTenantId());
+
+// int i = 0;
+// for (ApproveNode approveNode : list) {
+// int finalI = i;
+// if(i >= split.length){
+// approveNode.setDeleteFlag(1);
+// }else{
+// 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());
}
+ //瀹℃壒绫诲瀷鑾峰彇(涓庡墠绔〉闈㈠搴�)
+ private String approveProcessType(Integer approveType){
+ switch (approveType){
+ case 1:
+ return "鍏嚭绠＄悊";
+ case 2:
+ return "璇峰亣绠＄悊";
+ case 3:
+ return "鍑哄樊绠＄悊";
+ case 4:
+ return "鎶ラ攢绠＄悊";
+ case 5:
+ return "閲囪喘瀹℃壒";
+ case 6:
+ return "鎶ヤ环瀹℃壒";
+ case 7:
+ return "鍑哄簱瀹℃壒";
+ }
+ return null;
+ }
+
+
+
}
--
Gitblit v1.9.3