fix(approve): 优化审批计数器的自增逻辑

buhuazhen

2 天以前 bda2d004876498d1618a8a6e5fa0363e19d5c011

 src/main/java/com/ruoyi/approve/utils/DailyRedisCounter.java

@@ -71,15 +71,33 @@
     * @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 key = "approveNumHSXNY";

        return aLong == null ? 1 : aLong + 1;
        // 1. 先尝试从 Redis 自增（原子操作）
        Long num = redisTemplate.opsForValue().increment(key);

        // 2. 如果是第一次（说明 key 不存在）
        if (num == null || num == 1L) {

            // 查询数据库当前最大值（更合理）
            StartAndEndDateDto dateTime = getDateTime();

            LambdaQueryWrapper<ApproveProcess> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(ApproveProcess::getApproveDelete, 0)
                    .ge(ApproveProcess::getCreateTime, dateTime.getStartDate())
                    .lt(ApproveProcess::getCreateTime, dateTime.getEndDate());

            Long count = approveProcessMapper.selectCount(wrapper);

            long start = (count == null ? 0 : count) + 1;

            // 设置初始值（避免覆盖并发）
            redisTemplate.opsForValue().set(key, String.valueOf(start), 1L, TimeUnit.HOURS);

            return start;
        }

        return num;
    }

    /**