yys 修改协同审批bug

maven

3 天以前 91c0906bda26d3718b2fa450eed27419388b24a5

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

@@ -1,12 +1,18 @@
package com.ruoyi.approve.utils;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Calendar;
import java.util.Date;
import java.util.concurrent.TimeUnit;


@@ -21,7 +27,7 @@
        this.redisTemplate = redisTemplate;
    }

    /**
    /**查缓存
     * 获取指定计数器在今日的数值，并自增1
     * @param counterName 计数器名称（例如：login_count、order_count）
     * @return 今日自增后的计数值
@@ -39,6 +45,43 @@
        return count;
    }

    @Autowired
    private ApproveProcessMapper approveProcessMapper;

    /**
     * 获取当前时间的  开始日期  ，结束日期
     * @return
     */
    public static StartAndEndDateDto getDateTime(){
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        Date date = new Date();
        Calendar cal = Calendar.getInstance();
        cal.setTime(date);
        cal.add(Calendar.DATE,1);
        String startDateTime = simpleDateFormat.format(date);
        String endDateTime = simpleDateFormat.format(cal.getTime());
        StartAndEndDateDto startAndEndDateDto = new StartAndEndDateDto();
        startAndEndDateDto.setStartDate(startDateTime);
        startAndEndDateDto.setEndDate(endDateTime);
        return startAndEndDateDto;
    }

    /**查数据库
     * 获取指定计数器在今日的数值，并自增1
     * @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);

        return aLong == null ? 1 : aLong + 1;
    }

    /**
     * 获取指定计数器在今日的当前数值
     * @param counterName 计数器名称