diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java index 29628d006..31e16d077 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java @@ -287,7 +287,7 @@ public class ClientController extends BaseController { @GetMapping("/StatisGetOrderOfDate") public AjaxResult statisGetOrderOfDate(@RequestParam Date date) { - return orderDaoService.statisGetOrderOfDate(date); + return AjaxResult.success(orderDaoService.statisGetOrderOfDate(date,1 ,50)); } /** @@ -532,7 +532,7 @@ public class ClientController extends BaseController { Date today = new Date(); - return orderDaoService.statisGetOrderOfDate(today); + return AjaxResult.success(orderDaoService.statisGetOrderOfDate(today, 1, 100)); } /** 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 4d67a8ebb..50ef0c54b 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 @@ -137,9 +137,9 @@ public class FtOrderDaoController extends BaseController { Integer pageSize = params.getInteger("pageSize"); if (statisticsType == 1) { - return iFtOrderDaoService.statisGetOrderOfDate(selectDay); + return AjaxResult.success(iFtOrderDaoService.statisGetOrderOfDate(selectDay, pageNum, pageSize)); } else { - return iFtOrderDaoService.statisGetOrderOfDateByPerson(selectDay, pageNum, pageSize); + return AjaxResult.success(iFtOrderDaoService.statisGetOrderOfDateByPerson(selectDay, pageNum, pageSize)); } } @@ -155,9 +155,9 @@ public class FtOrderDaoController extends BaseController { Integer pageSize = params.getInteger("pageSize"); if (statisticsType == 1) { - return iFtOrderDaoService.statisGetOrderOfWeek(selectWeek); + return AjaxResult.success(iFtOrderDaoService.statisGetOrderOfWeek(selectWeek, pageNum, pageSize)); } else { - return iFtOrderDaoService.statisGetOrderOfWeekByPerson(selectWeek, pageNum, pageSize); + return AjaxResult.success(iFtOrderDaoService.statisGetOrderOfWeekByPerson(selectWeek, pageNum, pageSize)); } } @@ -174,9 +174,9 @@ public class FtOrderDaoController extends BaseController { Integer pageSize = params.getInteger("pageSize"); if (statisticsType == 1) { - return iFtOrderDaoService.statisGetOrderOfMonth(selectMonth); + return AjaxResult.success(iFtOrderDaoService.statisGetOrderOfMonth(selectMonth, pageNum, pageSize)); }else { - return iFtOrderDaoService.statisGetOrderOfMonthByPerson(selectMonth, pageNum, pageSize); + return AjaxResult.success(iFtOrderDaoService.statisGetOrderOfMonthByPerson(selectMonth, pageNum, pageSize)); } } } 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 1d2cf09b0..2bf0b220f 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 @@ -1,6 +1,8 @@ package com.ruoyi.system.fantang.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.system.fantang.domain.FtFoodDemandDao; import com.ruoyi.system.fantang.domain.FtOrderDao; import com.ruoyi.system.fantang.domain.FtStaffDemandDao; @@ -26,7 +28,7 @@ public interface FtOrderDaoMapper extends BaseMapper { " LEFT JOIN ft_staff_info b on a.staff_id = b.staff_id\n" + " LEFT JOIN ft_depart c on b.depart_id = c.depart_id where b.depart_id = c.depart_id and a.order_date BETWEEN #{start} and #{end}\n" + " GROUP BY a.order_type, c.depart_name") - List statisGetOrderOfDate(@Param("start") String start, @Param("end") String end); + IPage statisGetOrderOfDate(Page page, @Param("start") String start, @Param("end") String end); @Select("SELECT\n" + "\ta.order_type,\n" + @@ -46,8 +48,8 @@ public interface FtOrderDaoMapper extends BaseMapper { "\ta.order_type,\n" + "\tc.depart_name,\n" + "\tb.`name`,\n" + - "\tb.tel limit #{offset} , #{pageSize}") - List statisGetOrderOfDateByPerson(@Param("start") String start, @Param("end") String end, @Param("offset") Integer offset, @Param("pageSize") Integer pageSize); + "\tb.tel") + IPage statisGetOrderOfDateByPerson(Page page, @Param("start") String start, @Param("end") String end); 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 412a742f0..695c301fa 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 @@ -1,5 +1,6 @@ package com.ruoyi.system.fantang.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.system.fantang.domain.FtFoodDemandDao; @@ -34,17 +35,17 @@ public interface IFtOrderDaoService extends IService { AjaxResult cancelStopOrder(Long orderId); - AjaxResult statisGetOrderOfDate(Date date); + IPage statisGetOrderOfDate(Date date, Integer pageNum, Integer pageSize); - AjaxResult statisGetOrderOfDateByPerson(Date date, Integer pageNum, Integer pageSize); + IPage statisGetOrderOfDateByPerson(Date date, Integer pageNum, Integer pageSize); - AjaxResult statisGetOrderOfWeek(Date date); + IPage statisGetOrderOfWeek(Date date, Integer pageNum, Integer pageSize); - AjaxResult statisGetOrderOfWeekByPerson(Date date, Integer pageNum, Integer pageSize); + IPage statisGetOrderOfWeekByPerson(Date date, Integer pageNum, Integer pageSize); - AjaxResult statisGetOrderOfMonth(Date date); + IPage statisGetOrderOfMonth(Date date, Integer pageNum, Integer pageSize); - AjaxResult statisGetOrderOfMonthByPerson(Date date, Integer pageNum, Integer pageSize); + IPage 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 b690a3bd8..a3ef83173 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 @@ -2,6 +2,8 @@ package com.ruoyi.system.fantang.service.impl; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.system.fantang.domain.FtFoodDemandDao; @@ -132,36 +134,39 @@ public class FtOrderDaoServiceImpl extends ServiceImpl statisGetOrderOfDate(Date date, Integer pageNum, Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + return this.baseMapper.statisGetOrderOfDate(page, DateUtil.beginOfDay(date).toString(), DateUtil.endOfDay(date).toString()); } @Override - public AjaxResult statisGetOrderOfDateByPerson(Date date, Integer pageNum, Integer pageSize) { - Integer offset = (pageNum - 1) * pageSize; - return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfDay(date).toString(), DateUtil.endOfDay(date).toString(), offset, pageSize)); + public IPage statisGetOrderOfDateByPerson(Date date, Integer pageNum, Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + return this.baseMapper.statisGetOrderOfDateByPerson(page, DateUtil.beginOfDay(date).toString(), DateUtil.endOfDay(date).toString()); } @Override - public AjaxResult statisGetOrderOfWeek(Date date) { - return AjaxResult.success(this.baseMapper.statisGetOrderOfDate(DateUtil.beginOfWeek(date).toString(), DateUtil.endOfWeek(date).toString())); + public IPage statisGetOrderOfWeek(Date date, Integer pageNum, Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + return this.baseMapper.statisGetOrderOfDate(page, DateUtil.beginOfWeek(date).toString(), DateUtil.endOfWeek(date).toString()); } @Override - public AjaxResult statisGetOrderOfWeekByPerson(Date date, Integer pageNum, Integer pageSize) { - Integer offset = (pageNum - 1) * pageSize; - return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfWeek(date).toString(), DateUtil.endOfWeek(date).toString(), offset, pageSize)); + public IPage statisGetOrderOfWeekByPerson(Date date, Integer pageNum, Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + return this.baseMapper.statisGetOrderOfDateByPerson(page, DateUtil.beginOfWeek(date).toString(), DateUtil.endOfWeek(date).toString()); } @Override - public AjaxResult statisGetOrderOfMonth(Date date) { - return AjaxResult.success(this.baseMapper.statisGetOrderOfDate(DateUtil.beginOfMonth(date).toString(), DateUtil.endOfMonth(date).toString())); + public IPage statisGetOrderOfMonth(Date date, Integer pageNum, Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + return this.baseMapper.statisGetOrderOfDate(page, DateUtil.beginOfMonth(date).toString(), DateUtil.endOfMonth(date).toString()); } @Override - public AjaxResult statisGetOrderOfMonthByPerson(Date date, Integer pageNum, Integer pageSize) { - Integer offset = (pageNum - 1) * pageSize; - return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfMonth(date).toString(), DateUtil.endOfMonth(date).toString(), offset, pageSize)); + public IPage statisGetOrderOfMonthByPerson(Date date, Integer pageNum, Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + return this.baseMapper.statisGetOrderOfDateByPerson(page, DateUtil.beginOfMonth(date).toString(), DateUtil.endOfMonth(date).toString()); } @Override diff --git a/ruoyi-ui/src/views/fantang/orderStatistics/index.vue b/ruoyi-ui/src/views/fantang/orderStatistics/index.vue index b4397565b..86bfa9531 100644 --- a/ruoyi-ui/src/views/fantang/orderStatistics/index.vue +++ b/ruoyi-ui/src/views/fantang/orderStatistics/index.vue @@ -169,18 +169,21 @@ export default { if (this.selectType === 1 || this.selectType === '1') { getStatisGetOrderOfDay(this.queryParams).then(response => { console.log(response) - this.orderCountList = response.data; + this.orderCountList = response.data.records; + this.total = response.data.total; this.selectType = 1; }) } else if (this.selectType === 2 || this.selectType === '2') { getStatisGetOrderOfWeek(this.queryParams).then(response => { console.log(response) - this.orderCountList = response.data; + this.orderCountList = response.data.records; + this.total = response.data.total; this.selectType = 2; }) } else if (this.selectType === 3 || this.selectType === '3') { getStatisGetOrderOfMonth(this.queryParams).then(response => { - this.orderCountList = response.data; + this.orderCountList = response.data.records; + this.total = response.data.total; this.selectType = 3; }) } @@ -218,7 +221,8 @@ export default { this.queryParams.selectMonth = this.formMonth.selectMonth; this.queryParams.statisticsType = this.formMonth.statisticsType; getStatisGetOrderOfMonth(this.queryParams).then(response => { - this.orderCountList = response.data; + this.orderCountList = response.data.records; + this.total = response.data.total; this.selectType = 3; }) } @@ -233,7 +237,8 @@ export default { this.queryParams.statisticsType = this.formWeek.statisticsType; getStatisGetOrderOfWeek(this.queryParams).then(response => { console.log(response) - this.orderCountList = response.data; + this.orderCountList = response.data.records; + this.total = response.data.total; this.selectType = 2; }) } @@ -248,7 +253,8 @@ export default { this.queryParams.statisticsType = this.formDay.statisticsType; getStatisGetOrderOfDay(this.queryParams).then(response => { console.log(response) - this.orderCountList = response.data; + this.orderCountList = response.data.records; + this.total = response.data.total; this.selectType = 1; }) }