From bd897b186f4dd82beb5a9f9f7f41555dcd77bf7e Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 07 一月 2026 14:35:46 +0800
Subject: [PATCH] 设备报修增添审批人id，维修价格字段，重整状态对应值。优化添加设备报修接口，同步数据到协同办公-报销管理。协同办公-报销管理的审核接口同步设备管理-设备报修状态。设备报修删除接口根据报销管理审核状态判断是否删除。
---
src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
index 0fdcfc5..d98a005 100644
--- a/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
+++ b/src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java
@@ -71,15 +71,29 @@
* @return 浠婃棩鑷鍚庣殑璁℃暟鍊�
*/
public long incrementAndGetByDb() {
- StartAndEndDateDto dateTime = getDateTime();
- LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
- approveProcessLambdaQueryWrapper
- .eq(ApproveProcess::getApproveDelete,0)
- .gt(ApproveProcess::getCreateTime,dateTime.getStartDate())
- .lt(ApproveProcess::getCreateTime,dateTime.getEndDate());
- Long aLong = approveProcessMapper.selectCount(approveProcessLambdaQueryWrapper);
+ String approveId = redisTemplate.opsForValue().get("approveNum");
+ if(approveId == null){
+ StartAndEndDateDto dateTime = getDateTime();
+ LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveProcessLambdaQueryWrapper
+ .eq(ApproveProcess::getApproveDelete,0)
+ .gt(ApproveProcess::getCreateTime,dateTime.getStartDate())
+ .lt(ApproveProcess::getCreateTime,dateTime.getEndDate());
+ Long aLong = approveProcessMapper.selectCount(approveProcessLambdaQueryWrapper);
+ if(aLong == null){
+ redisTemplate.opsForValue().set("approveNum","1",1L, TimeUnit.HOURS);
+ return 1;
+ }else{
+ aLong += 1;
+ redisTemplate.opsForValue().set("approveNum",aLong.toString(),1L, TimeUnit.HOURS);
+ return aLong;
+ }
+ }else{
+ Long num = Long.parseLong(approveId) + 1;
+ redisTemplate.opsForValue().set("approveNum",num.toString(),1L, TimeUnit.HOURS);
+ return Long.parseLong(approveId);
+ }
- return aLong == null ? 1 : aLong + 1;
}
/**
--
Gitblit v1.9.3