diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java index f9e5e9658..e3d203c20 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java @@ -16,6 +16,7 @@ import com.ruoyi.quartz.mapper.SysJobMapper; import com.ruoyi.quartz.service.ISysJobService; import com.ruoyi.quartz.util.CronUtils; import com.ruoyi.quartz.util.ScheduleUtils; +import com.ruoyi.xkt.dto.feedback.FeedbackResDTO; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.quartz.JobDataMap; @@ -78,7 +79,7 @@ public class SysJobServiceImpl implements ISysJobService { } PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize()); List list = this.jobMapper.selectList(queryWrapper); - return Page.convert(new PageInfo<>(BeanUtil.copyToList(list, JobPageResDTO.class))); + return Page.convert(new PageInfo<>(list), BeanUtil.copyToList(list, JobPageResDTO.class)); } /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStatisticsMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStatisticsMapper.java index b610ec1f8..c23230fa8 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStatisticsMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStatisticsMapper.java @@ -17,6 +17,13 @@ import java.util.List; @Repository public interface StoreProductStatisticsMapper extends BaseMapper { + /** + * 查询系统图搜热款 + * + * @param beginDate 查询开始时间 + * @param endDate 查询结束时间 + * @return List + */ List listProdImgSearchCount(@Param("beginDate") Date beginDate, @Param("endDate") Date endDate); /**