调整金额
This commit is contained in:
@@ -36,13 +36,20 @@ public class ChartController {
|
||||
// 计算当前时间
|
||||
Date currentTime = new Date();
|
||||
|
||||
// 计算结束时间(明天的00:00:00)
|
||||
Calendar endCalendar = (Calendar) calendar.clone();
|
||||
endCalendar.add(Calendar.DAY_OF_MONTH, 1);
|
||||
Date endOfDay = endCalendar.getTime();
|
||||
// 将startTime和endTime转换为字符串格式,使用"yyyy-MM-dd HH:mm:ss"格式
|
||||
String startTimeStr = DateFormatUtils.format(startOfDay, "yyyy-MM-dd HH:mm:ss");
|
||||
String endTimeStr = DateFormatUtils.format(endOfDay, "yyyy-MM-dd HH:mm:ss");
|
||||
List<CompletedToday> todayData = completedTodayRepository.findTodayData(startTimeStr, endTimeStr);
|
||||
// 从数据库获取今日的CompletedToday数据
|
||||
List<CompletedToday> todayData = completedTodayRepository.findByCreateTimeAfter(startOfDay);
|
||||
|
||||
|
||||
// 过滤出当前时间之前的数据
|
||||
List<CompletedToday> filteredData = new ArrayList<>();
|
||||
for (CompletedToday item : todayData) {
|
||||
if (item.getCreateTime().before(currentTime)) {
|
||||
if (item.getCreateTime().after(startOfDay)) {
|
||||
filteredData.add(item);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,4 +30,7 @@ public interface CompletedTodayRepository extends JpaRepository<CompletedToday,
|
||||
@Query("SELECT ct FROM CompletedToday ct WHERE ct.time >= :startTime")
|
||||
List<CompletedToday> findByCreateTimeAfter(@Param("startTime") Date startTime);
|
||||
|
||||
@Query(value = "SELECT * FROM completed_today WHERE create_time >= :startTime AND create_time < :endTime", nativeQuery = true)
|
||||
List<CompletedToday> findTodayData(@Param("startTime") String startTime, @Param("endTime") String endTime);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user