From bb7f1da14d43246731dc7a5037a243f8a14a3567 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 23 六月 2026 13:12:07 +0800
Subject: [PATCH] fix: 审批节点流程编号修改
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 21 +++++++++-
src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java | 43 +++++++++++++++++++++
2 files changed, 61 insertions(+), 3 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 176973f..dc55afd 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -105,8 +105,15 @@
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.incrementAndGetByDb();
+ LocalDate targetDate = LocalDate.now();
+ if (!StringUtils.isEmpty(approveProcessVO.getApproveTime())) {
+ try {
+ targetDate = LocalDate.parse(approveProcessVO.getApproveTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ } catch (Exception e) {
+ }
+ }
+ String today = targetDate.format(DATE_FORMAT);
+ Long approveId = dailyRedisCounter.incrementAndGetByDb(targetDate);
String formattedCount = String.format("%03d", approveId);
//娴佺▼ ID
String approveID = today + formattedCount;
@@ -129,7 +136,15 @@
approveProcess.setApproveStatus(0);
approveProcess.setApproveDelete(0);
approveProcess.setApproveType(approveProcessVO.getApproveType());
- approveProcess.setCreateTime(LocalDateTime.now());
+ LocalDateTime createDateTime = LocalDateTime.now();
+ if (!StringUtils.isEmpty(approveProcessVO.getApproveTime())) {
+ try {
+ createDateTime = LocalDate.parse(approveProcessVO.getApproveTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay();
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ approveProcess.setCreateTime(createDateTime);
approveProcess.setTenantId(approveProcessVO.getApproveDeptId());
approveProcess.setApproveUserIds(approveProcessVO.getApproveUserIds());
approveProcess.setApproveUserCurrentId(longList.get(0));
diff --git a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
index 3f9aeca..8256ad8 100644
--- a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
+++ b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
@@ -114,6 +114,49 @@
return redisTemplate.opsForValue().increment(key);
}
+ /**鏌ユ暟鎹簱
+ * 鑾峰彇鎸囧畾鏃ユ湡鍦ㄤ粖鏃ョ殑鏁板�硷紝骞惰嚜澧�1
+ * @return 鐩爣鏃ユ湡鑷鍚庣殑璁℃暟鍊�
+ */
+ public long incrementAndGetByDb(LocalDate targetDate) {
+ if (targetDate == null) {
+ targetDate = LocalDate.now();
+ }
+ String dateStr = targetDate.format(DATE_FORMAT);
+ String key = approvalNumberPrefix + ":approveNum:" + dateStr;
+ String lockKey = "lock:" + key;
+
+ if (Boolean.FALSE.equals(redisTemplate.hasKey(key))) {
+ Boolean acquired = redisTemplate.opsForValue().setIfAbsent(lockKey, "1", 10, TimeUnit.SECONDS);
+ if (Boolean.TRUE.equals(acquired)) {
+ try {
+ if (Boolean.FALSE.equals(redisTemplate.hasKey(key))) {
+ LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveProcessLambdaQueryWrapper
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .likeRight(ApproveProcess::getApproveId, dateStr);
+ Long count = approveProcessMapper.selectCount(approveProcessLambdaQueryWrapper);
+ long initialCount = (count == null) ? 0 : count;
+
+ redisTemplate.opsForValue().set(key, String.valueOf(initialCount), 24, TimeUnit.HOURS);
+ }
+ } finally {
+ // 閲婃斁閿�
+ redisTemplate.delete(lockKey);
+ }
+ } else {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ return incrementAndGetByDb(targetDate); // 閫掑綊閲嶈瘯
+ }
+ }
+
+ return redisTemplate.opsForValue().increment(key);
+ }
+
/**
* 鑾峰彇鎸囧畾璁℃暟鍣ㄥ湪浠婃棩鐨勫綋鍓嶆暟鍊�
* @param counterName 璁℃暟鍣ㄥ悕绉�
--
Gitblit v1.9.3