From 43a8301f04a6ea7891ef16861734163b2646e07f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 14 一月 2026 18:05:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 99 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 91 insertions(+), 8 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 58e188c..c34e20a 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -22,6 +22,7 @@
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;
@@ -61,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 {
@@ -74,16 +76,14 @@
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);
- String approve_process = OrderUtils.countTodayByCreateTime(approveProcessMapper, "");
-// Long approveId = dailyRedisCounter.incrementAndGetByDb();
-// String formattedCount = String.format("%03d", approveId);
+ String today = LocalDate.now().format(DATE_FORMAT);
+ Long approveId = dailyRedisCounter.incrementAndGetByDb();
+ String formattedCount = String.format("%03d", approveId);
//娴佺▼ ID
-// String approveID = today + formattedCount;
+ String approveID = today + formattedCount;
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
ApproveProcess approveProcess = new ApproveProcess();
- BeanUtils.copyProperties(approveProcessVO, approveProcess);
- approveProcess.setApproveId(approve_process);
+ approveProcess.setApproveId(approveID);
approveProcess.setApproveUser(approveProcessVO.getApproveUser());
approveProcess.setApproveUserName(sysUser.getNickName());
approveProcess.setApproveDeptId(approveProcessVO.getApproveDeptId());
@@ -91,6 +91,9 @@
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.setPrice(approveProcessVO.getPrice());
approveProcess.setApproveOverTime(null);
approveProcess.setApproveStatus(0);
approveProcess.setApproveDelete(0);
@@ -113,9 +116,16 @@
}
save(approveProcess);
//鍒濆鍖栧鎵硅妭鐐�
- approveNodeService.initApproveNodes(approveProcessVO.getApproveUserIds(),approve_process,approveProcessVO.getApproveDeptId());
+ 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 +181,48 @@
private final ApproveNodeMapper approveNodeMapper;
+ // 鎶ヤ环瀹℃壒缂栬緫瀹℃牳浜�
+ public void updateApproveUser(ApproveGetAndUpdateVo approveGetAndUpdateVo){
+ LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveType, approveGetAndUpdateVo.getApproveType())
+ .eq(ApproveProcess::getApproveReason, approveGetAndUpdateVo.getApproveReason())
+ .last("limit 1");
+ ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
+ if(approveProcess == null) throw new RuntimeException("璇烽�夋嫨瀹℃壒浜�");
+ 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(approveProcess.getApproveStatus() != 1){
+ approveProcess.setApproveUserCurrentId(Long.parseLong(split[0]));
+ approveProcess.setApproveUserCurrentName(sysUsers.stream().filter(user -> user.getUserId().equals(Long.parseLong(split[0]))).collect(Collectors.toList()).get(0).getNickName());
+ }
+ if(approveGetAndUpdateVo.getApproveStatus() != null){
+ approveProcess.setApproveStatus(approveGetAndUpdateVo.getApproveStatus());
+ }
+ approveProcess.setApproveUserIds(approveGetAndUpdateVo.getApproveUserIds());
+ updateById(approveProcess);
+ //淇敼瀹℃壒浜�
+ // 鍏堝垹闄� 鍚庢柊澧�
+ LambdaQueryWrapper<ApproveNode> approveNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveProcess.getApproveId())
+ .eq(ApproveNode::getDeleteFlag, 0)
+ .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
+ .orderByAsc(ApproveNode::getApproveNodeOrder);
+ approveNodeMapper.delete(approveNodeLambdaQueryWrapper);
+ approveNodeService.initApproveNodes(approveGetAndUpdateVo.getApproveUserIds(),approveProcess.getApproveId(),approveProcess.getTenantId());
+ /*娑堟伅閫氱煡*/
+ String id = approveProcess.getApproveUserIds().split(",")[0];
+ sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
+ approveProcess.getApproveId()+"娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
+ Arrays.asList(Long.valueOf(id)),
+ approveProcess.getApproveDeptId(),
+ "/collaborativeApproval/approvalProcess?approveType="+approveProcess.getApproveType()+"&approveId="+approveProcess.getApproveId());
+ }
+
@Override
public void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
@@ -221,7 +273,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