diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtOrderDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtOrderDaoController.java index fa89517df..e9799a2e5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtOrderDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtOrderDaoController.java @@ -133,11 +133,13 @@ public class FtOrderDaoController extends BaseController { startPage(); Date selectDay = params.getDate("selectDay"); Integer statisticsType = params.getInteger("statisticsType"); + Integer pageNum = params.getInteger("pageNum"); + Integer pageSize = params.getInteger("pageSize"); if (statisticsType == 1) { return iFtOrderDaoService.statisGetOrderOfDate(selectDay); } else { - return iFtOrderDaoService.statisGetOrderOfDateByPerson(selectDay); + return iFtOrderDaoService.statisGetOrderOfDateByPerson(selectDay, pageNum, pageSize); } } @@ -153,7 +155,8 @@ public class FtOrderDaoController extends BaseController { if (statisticsType == 1) { return iFtOrderDaoService.statisGetOrderOfWeek(selectWeek); } else { - return iFtOrderDaoService.statisGetOrderOfWeekByPerson(selectWeek); +// return iFtOrderDaoService.statisGetOrderOfWeekByPerson(selectWeek); + return null; } } @@ -169,7 +172,8 @@ public class FtOrderDaoController extends BaseController { if (statisticsType == 1) { return iFtOrderDaoService.statisGetOrderOfMonth(selectMonth); }else { - return iFtOrderDaoService.statisGetOrderOfMonthByPerson(selectMonth); +// return iFtOrderDaoService.statisGetOrderOfMonthByPerson(selectMonth); + return null; } } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtOrderDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtOrderDaoMapper.java index 6319a6f14..d8faaafe4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtOrderDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtOrderDaoMapper.java @@ -43,8 +43,8 @@ public interface FtOrderDaoMapper extends BaseMapper { "\ta.order_type,\n" + "\tc.depart_name,\n" + "\tb.`name`,\n" + - "\tb.tel") - List statisGetOrderOfDateByPerson(@Param("start") String start, @Param("end") String end); + "\tb.tel limit #{offset} , #{pageSize}") + List statisGetOrderOfDateByPerson(@Param("start") String start, @Param("end") String end, @Param("offset") Integer offset, @Param("pageSize") Integer pageSize); List listDetailedByDate(@Param("orderType") Integer orderType, @Param("start") String start, @Param("end") String end); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtOrderDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtOrderDaoService.java index 84f9dedac..cf0baac18 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtOrderDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtOrderDaoService.java @@ -33,15 +33,15 @@ public interface IFtOrderDaoService extends IService { AjaxResult statisGetOrderOfDate(Date date); - AjaxResult statisGetOrderOfDateByPerson(Date date); + AjaxResult statisGetOrderOfDateByPerson(Date date, Integer pageNum, Integer pageSize); AjaxResult statisGetOrderOfWeek(Date date); - AjaxResult statisGetOrderOfWeekByPerson(Date date); + AjaxResult statisGetOrderOfWeekByPerson(Date date, Integer pageNum, Integer pageSize); AjaxResult statisGetOrderOfMonth(Date date); - AjaxResult statisGetOrderOfMonthByPerson(Date date); + AjaxResult statisGetOrderOfMonthByPerson(Date date, Integer pageNum, Integer pageSize); List listDetailedByDate(Integer orderType, String start, String end); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtOrderDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtOrderDaoServiceImpl.java index 64b7e33c5..0966fabd8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtOrderDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtOrderDaoServiceImpl.java @@ -131,8 +131,9 @@ public class FtOrderDaoServiceImpl extends ServiceImpl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -275,6 +144,8 @@ export default { queryParams: { pageNum: 1, pageSize: 10, + selectDay: null, + statisticsType: null, }, // 表单参数 form: {}, @@ -342,7 +213,9 @@ export default { } if (this.formDay.selectDay != null && this.formDay.statisticsType != null) { console.log(this.formDay) - getStatisGetOrderOfDay(this.formDay).then(response => { + this.queryParams.selectDay = this.formDay.selectDay; + this.queryParams.statisticsType = this.formDay.statisticsType; + getStatisGetOrderOfDay(this.queryParams).then(response => { console.log(response) this.orderCountList = response.data; })