abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正报餐统计分页前端功能

Browse Source
This commit is contained in:
czx 2021-01-19 18:33:53 +08:00
parent 5b1eb6d89d
commit c1b9a4adaa
6 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java
View File

@ -287,7 +287,7 @@ public class ClientController extends BaseController {
@GetMapping("/StatisGetOrderOfDate") @GetMapping("/StatisGetOrderOfDate")
public AjaxResult statisGetOrderOfDate(@RequestParam Date date) { 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(); Date today = new Date();
return orderDaoService.statisGetOrderOfDate(today); return AjaxResult.success(orderDaoService.statisGetOrderOfDate(today, 1, 100));
} }
/** /**

12
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtOrderDaoController.java
View File

@ -137,9 +137,9 @@ public class FtOrderDaoController extends BaseController {
Integer pageSize = params.getInteger("pageSize"); Integer pageSize = params.getInteger("pageSize");
if (statisticsType == 1) { if (statisticsType == 1) {
return iFtOrderDaoService.statisGetOrderOfDate(selectDay); return AjaxResult.success(iFtOrderDaoService.statisGetOrderOfDate(selectDay, pageNum, pageSize));
} else { } 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"); Integer pageSize = params.getInteger("pageSize");
if (statisticsType == 1) { if (statisticsType == 1) {
return iFtOrderDaoService.statisGetOrderOfWeek(selectWeek); return AjaxResult.success(iFtOrderDaoService.statisGetOrderOfWeek(selectWeek, pageNum, pageSize));
} else { } 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"); Integer pageSize = params.getInteger("pageSize");
if (statisticsType == 1) { if (statisticsType == 1) {
return iFtOrderDaoService.statisGetOrderOfMonth(selectMonth); return AjaxResult.success(iFtOrderDaoService.statisGetOrderOfMonth(selectMonth, pageNum, pageSize));
}else { }else {
return iFtOrderDaoService.statisGetOrderOfMonthByPerson(selectMonth, pageNum, pageSize); return AjaxResult.success(iFtOrderDaoService.statisGetOrderOfMonthByPerson(selectMonth, pageNum, pageSize));
} }
} }
} }

8
ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtOrderDaoMapper.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.fantang.mapper; package com.ruoyi.system.fantang.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.FtFoodDemandDao;
import com.ruoyi.system.fantang.domain.FtOrderDao; import com.ruoyi.system.fantang.domain.FtOrderDao;
import com.ruoyi.system.fantang.domain.FtStaffDemandDao; import com.ruoyi.system.fantang.domain.FtStaffDemandDao;
@ -26,7 +28,7 @@ public interface FtOrderDaoMapper extends BaseMapper<FtOrderDao> {
" LEFT JOIN ft_staff_info b on a.staff_id = b.staff_id\n" + " 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" + " 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") " GROUP BY a.order_type, c.depart_name")
List<FtOrderDao> statisGetOrderOfDate(@Param("start") String start, @Param("end") String end); IPage<FtOrderDao> statisGetOrderOfDate(Page<FtOrderDao> page, @Param("start") String start, @Param("end") String end);
@Select("SELECT\n" + @Select("SELECT\n" +
"\ta.order_type,\n" + "\ta.order_type,\n" +
@ -46,8 +48,8 @@ public interface FtOrderDaoMapper extends BaseMapper<FtOrderDao> {
"\ta.order_type,\n" + "\ta.order_type,\n" +
"\tc.depart_name,\n" + "\tc.depart_name,\n" +
"\tb.`name`,\n" + "\tb.`name`,\n" +
"\tb.tel limit #{offset} , #{pageSize}") "\tb.tel")
List<FtOrderDao> statisGetOrderOfDateByPerson(@Param("start") String start, @Param("end") String end, @Param("offset") Integer offset, @Param("pageSize") Integer pageSize); IPage<FtOrderDao> statisGetOrderOfDateByPerson(Page<FtOrderDao> page, @Param("start") String start, @Param("end") String end);
List<FtOrderDao> listDetailedByDate(@Param("orderType") Integer orderType, @Param("start") String start, @Param("end") String end); List<FtOrderDao> listDetailedByDate(@Param("orderType") Integer orderType, @Param("start") String start, @Param("end") String end);

13
ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtOrderDaoService.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.system.fantang.service; package com.ruoyi.system.fantang.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.fantang.domain.FtFoodDemandDao; import com.ruoyi.system.fantang.domain.FtFoodDemandDao;
@ -34,17 +35,17 @@ public interface IFtOrderDaoService extends IService<FtOrderDao> {
AjaxResult cancelStopOrder(Long orderId); AjaxResult cancelStopOrder(Long orderId);
AjaxResult statisGetOrderOfDate(Date date); IPage<FtOrderDao> statisGetOrderOfDate(Date date, Integer pageNum, Integer pageSize);
AjaxResult statisGetOrderOfDateByPerson(Date date, Integer pageNum, Integer pageSize); IPage<FtOrderDao> statisGetOrderOfDateByPerson(Date date, Integer pageNum, Integer pageSize);
AjaxResult statisGetOrderOfWeek(Date date); IPage<FtOrderDao> statisGetOrderOfWeek(Date date, Integer pageNum, Integer pageSize);
AjaxResult statisGetOrderOfWeekByPerson(Date date, Integer pageNum, Integer pageSize); IPage<FtOrderDao> statisGetOrderOfWeekByPerson(Date date, Integer pageNum, Integer pageSize);
AjaxResult statisGetOrderOfMonth(Date date); IPage<FtOrderDao> statisGetOrderOfMonth(Date date, Integer pageNum, Integer pageSize);
AjaxResult statisGetOrderOfMonthByPerson(Date date, Integer pageNum, Integer pageSize); IPage<FtOrderDao> statisGetOrderOfMonthByPerson(Date date, Integer pageNum, Integer pageSize);
List<FtOrderDao> listDetailedByDate(Integer orderType, String start, String end); List<FtOrderDao> listDetailedByDate(Integer orderType, String start, String end);

35
ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtOrderDaoServiceImpl.java
View File

@ -2,6 +2,8 @@ package com.ruoyi.system.fantang.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.fantang.domain.FtFoodDemandDao; import com.ruoyi.system.fantang.domain.FtFoodDemandDao;
@ -132,36 +134,39 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
} }
@Override @Override
public AjaxResult statisGetOrderOfDate(Date date) { public IPage<FtOrderDao> statisGetOrderOfDate(Date date, Integer pageNum, Integer pageSize) {
return AjaxResult.success(this.baseMapper.statisGetOrderOfDate(DateUtil.beginOfDay(date).toString(), DateUtil.endOfDay(date).toString())); Page<FtOrderDao> page = new Page<>(pageNum, pageSize);
return this.baseMapper.statisGetOrderOfDate(page, DateUtil.beginOfDay(date).toString(), DateUtil.endOfDay(date).toString());
} }
@Override @Override
public AjaxResult statisGetOrderOfDateByPerson(Date date, Integer pageNum, Integer pageSize) { public IPage<FtOrderDao> statisGetOrderOfDateByPerson(Date date, Integer pageNum, Integer pageSize) {
Integer offset = (pageNum - 1) * pageSize; Page<FtOrderDao> page = new Page<>(pageNum, pageSize);
return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfDay(date).toString(), DateUtil.endOfDay(date).toString(), offset, pageSize)); return this.baseMapper.statisGetOrderOfDateByPerson(page, DateUtil.beginOfDay(date).toString(), DateUtil.endOfDay(date).toString());
} }
@Override @Override
public AjaxResult statisGetOrderOfWeek(Date date) { public IPage<FtOrderDao> statisGetOrderOfWeek(Date date, Integer pageNum, Integer pageSize) {
return AjaxResult.success(this.baseMapper.statisGetOrderOfDate(DateUtil.beginOfWeek(date).toString(), DateUtil.endOfWeek(date).toString())); Page<FtOrderDao> page = new Page<>(pageNum, pageSize);
return this.baseMapper.statisGetOrderOfDate(page, DateUtil.beginOfWeek(date).toString(), DateUtil.endOfWeek(date).toString());
} }
@Override @Override
public AjaxResult statisGetOrderOfWeekByPerson(Date date, Integer pageNum, Integer pageSize) { public IPage<FtOrderDao> statisGetOrderOfWeekByPerson(Date date, Integer pageNum, Integer pageSize) {
Integer offset = (pageNum - 1) * pageSize; Page<FtOrderDao> page = new Page<>(pageNum, pageSize);
return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfWeek(date).toString(), DateUtil.endOfWeek(date).toString(), offset, pageSize)); return this.baseMapper.statisGetOrderOfDateByPerson(page, DateUtil.beginOfWeek(date).toString(), DateUtil.endOfWeek(date).toString());
} }
@Override @Override
public AjaxResult statisGetOrderOfMonth(Date date) { public IPage<FtOrderDao> statisGetOrderOfMonth(Date date, Integer pageNum, Integer pageSize) {
return AjaxResult.success(this.baseMapper.statisGetOrderOfDate(DateUtil.beginOfMonth(date).toString(), DateUtil.endOfMonth(date).toString())); Page<FtOrderDao> page = new Page<>(pageNum, pageSize);
return this.baseMapper.statisGetOrderOfDate(page, DateUtil.beginOfMonth(date).toString(), DateUtil.endOfMonth(date).toString());
} }
@Override @Override
public AjaxResult statisGetOrderOfMonthByPerson(Date date, Integer pageNum, Integer pageSize) { public IPage<FtOrderDao> statisGetOrderOfMonthByPerson(Date date, Integer pageNum, Integer pageSize) {
Integer offset = (pageNum - 1) * pageSize; Page<FtOrderDao> page = new Page<>(pageNum, pageSize);
return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfMonth(date).toString(), DateUtil.endOfMonth(date).toString(), offset, pageSize)); return this.baseMapper.statisGetOrderOfDateByPerson(page, DateUtil.beginOfMonth(date).toString(), DateUtil.endOfMonth(date).toString());
} }
@Override @Override

18
ruoyi-ui/src/views/fantang/orderStatistics/index.vue
View File

@ -169,18 +169,21 @@ export default {
if (this.selectType === 1 || this.selectType === '1') { if (this.selectType === 1 || this.selectType === '1') {
getStatisGetOrderOfDay(this.queryParams).then(response => { getStatisGetOrderOfDay(this.queryParams).then(response => {
console.log(response) console.log(response)
this.orderCountList = response.data; this.orderCountList = response.data.records;
this.total = response.data.total;
this.selectType = 1; this.selectType = 1;
}) })
} else if (this.selectType === 2 || this.selectType === '2') { } else if (this.selectType === 2 || this.selectType === '2') {
getStatisGetOrderOfWeek(this.queryParams).then(response => { getStatisGetOrderOfWeek(this.queryParams).then(response => {
console.log(response) console.log(response)
this.orderCountList = response.data; this.orderCountList = response.data.records;
this.total = response.data.total;
this.selectType = 2; this.selectType = 2;
}) })
} else if (this.selectType === 3 || this.selectType === '3') { } else if (this.selectType === 3 || this.selectType === '3') {
getStatisGetOrderOfMonth(this.queryParams).then(response => { getStatisGetOrderOfMonth(this.queryParams).then(response => {
this.orderCountList = response.data; this.orderCountList = response.data.records;
this.total = response.data.total;
this.selectType = 3; this.selectType = 3;
}) })
} }
@ -218,7 +221,8 @@ export default {
this.queryParams.selectMonth = this.formMonth.selectMonth; this.queryParams.selectMonth = this.formMonth.selectMonth;
this.queryParams.statisticsType = this.formMonth.statisticsType; this.queryParams.statisticsType = this.formMonth.statisticsType;
getStatisGetOrderOfMonth(this.queryParams).then(response => { getStatisGetOrderOfMonth(this.queryParams).then(response => {
this.orderCountList = response.data; this.orderCountList = response.data.records;
this.total = response.data.total;
this.selectType = 3; this.selectType = 3;
}) })
} }
@ -233,7 +237,8 @@ export default {
this.queryParams.statisticsType = this.formWeek.statisticsType; this.queryParams.statisticsType = this.formWeek.statisticsType;
getStatisGetOrderOfWeek(this.queryParams).then(response => { getStatisGetOrderOfWeek(this.queryParams).then(response => {
console.log(response) console.log(response)
this.orderCountList = response.data; this.orderCountList = response.data.records;
this.total = response.data.total;
this.selectType = 2; this.selectType = 2;
}) })
} }
@ -248,7 +253,8 @@ export default {
this.queryParams.statisticsType = this.formDay.statisticsType; this.queryParams.statisticsType = this.formDay.statisticsType;
getStatisGetOrderOfDay(this.queryParams).then(response => { getStatisGetOrderOfDay(this.queryParams).then(response => {
console.log(response) console.log(response)
this.orderCountList = response.data; this.orderCountList = response.data.records;
this.total = response.data.total;
this.selectType = 1; this.selectType = 1;
}) })
} }