From 21573e8e02dc47202ca3e1f7d4705795a09c1b60 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 29 七月 2025 09:11:36 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java index 6214f46..351c370 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.LocalTime; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -43,8 +44,13 @@ @Override public IPage<MgtOneClinkSyncPageVO> pageOneClinkSyncing(MgtOneClinkSyncingPageDTO mgtPageDto) { + LocalDateTime startTime = mgtPageDto.getSyncingStartTime().atStartOfDay(); + LocalDateTime endTime = mgtPageDto.getSyncingEndTime().atTime(LocalTime.MAX); + mgtPageDto.setStartTime(startTime); + mgtPageDto.setEndTime(endTime); //分页查询 IPage<MgtOneClinkSyncPageVO> page = new Page<>(mgtPageDto.getPageNum(),mgtPageDto.getPageSize()); + return this.baseMapper.pageOneClinkSyncing(page,mgtPageDto); } -- Gitblit v1.7.1