From 60efbcfffc9cdeb90976f05f08ccd6670d687f7a Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 02 十二月 2025 15:13:59 +0800
Subject: [PATCH] yys
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 14 ++++++++------
src/main/java/com/ruoyi/common/utils/OrderUtils.java | 3 ++-
src/main/resources/application-native.yml | 4 ++--
3 files changed, 12 insertions(+), 9 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..58e188c 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -15,6 +15,7 @@
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;
@@ -73,15 +74,16 @@
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();
- String formattedCount = String.format("%03d", approveId);
+// String today = LocalDate.now().format(DATE_FORMAT);
+ String approve_process = OrderUtils.countTodayByCreateTime(approveProcessMapper, "");
+// 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(approveID);
+ approveProcess.setApproveId(approve_process);
approveProcess.setApproveUser(approveProcessVO.getApproveUser());
approveProcess.setApproveUserName(sysUser.getNickName());
approveProcess.setApproveDeptId(approveProcessVO.getApproveDeptId());
@@ -111,7 +113,7 @@
}
save(approveProcess);
//鍒濆鍖栧鎵硅妭鐐�
- approveNodeService.initApproveNodes(approveProcessVO.getApproveUserIds(),approveID,approveProcessVO.getApproveDeptId());
+ approveNodeService.initApproveNodes(approveProcessVO.getApproveUserIds(),approve_process,approveProcessVO.getApproveDeptId());
// 闄勪欢缁戝畾
tempFileService.migrateTempFilesToFormal(approveProcess.getId(), approveProcessVO.getTempFileIds(), FileNameType.ApproveProcess.getValue());
}
diff --git a/src/main/java/com/ruoyi/common/utils/OrderUtils.java b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
index 42c154d..9520b75 100644
--- a/src/main/java/com/ruoyi/common/utils/OrderUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
@@ -51,5 +51,6 @@
// 鎵ц鏌ヨ
Long aLong = mapper.selectCount(queryWrapper);
// 鎷兼帴璁㈠崟缂栧彿 preFix + 鏃堕棿锛坹yyyMMdd锛� + 璁㈠崟鏁伴噺(001)
- return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1));}
+ return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1));
+ }
}
diff --git a/src/main/resources/application-native.yml b/src/main/resources/application-native.yml
index 5620917..38f492e 100644
--- a/src/main/resources/application-native.yml
+++ b/src/main/resources/application-native.yml
@@ -134,8 +134,8 @@
# redis 閰嶇疆
redis:
# 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
+ host: 127.0.0.1
+# host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
--
Gitblit v1.9.3