From 645fe0426017b280aa107b9363d37dc85470601b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 12 一月 2026 17:17:50 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 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 8d1ca6d..2a430a9 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -15,12 +15,14 @@
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;
@@ -60,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 {
@@ -80,7 +83,6 @@
String approveID = today + formattedCount;
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
ApproveProcess approveProcess = new ApproveProcess();
- BeanUtils.copyProperties(approveProcessVO, approveProcess);
approveProcess.setApproveId(approveID);
approveProcess.setApproveUser(approveProcessVO.getApproveUser());
approveProcess.setApproveUserName(sysUser.getNickName());
@@ -89,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);
@@ -114,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
@@ -219,7 +230,38 @@
// i++;
// }
tempFileService.migrateTempFilesToFormal(approve.getId(), approveGetAndUpdateVo.getTempFileIds(), FileNameType.ApproveProcess.getValue());
+ /*娑堟伅閫氱煡*/
+ String id = approve.getApproveUserIds().split(",")[0];
+ sysNoticeService.simpleNoticeByUser(approveProcessType(approve.getApproveType()),
+ approve.getApproveId()+"娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
+ Arrays.asList(Long.valueOf(id)),
+ approve.getApproveDeptId(),
+ "/collaborativeApproval/approvalProcess?approveType="+approve.getApproveType()+"&approveId="+approve.getApproveId());
+
}
+ //瀹℃壒绫诲瀷鑾峰彇(涓庡墠绔〉闈㈠搴�)
+ 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