todo：报餐统计总数

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

@@ -130,7 +130,7 @@ public class FtOrderDaoController extends BaseController {
      */
     @PostMapping("/getStatisGetOrderOfDay")
     public AjaxResult getStatisGetOrderOfDay(@RequestBody JSONObject params) {
-        startPage();
+
         Date selectDay = params.getDate("selectDay");
         Integer statisticsType = params.getInteger("statisticsType");
         Integer pageNum = params.getInteger("pageNum");
@@ -148,15 +148,16 @@ public class FtOrderDaoController extends BaseController {
      */
     @PostMapping("/getStatisGetOrderOfWeek")
     public AjaxResult getStatisGetOrderOfWeek(@RequestBody JSONObject params) {
-        System.out.println(params);
+
         Date selectWeek = params.getDate("selectWeek");
         Integer statisticsType = params.getInteger("statisticsType");
+        Integer pageNum = params.getInteger("pageNum");
+        Integer pageSize = params.getInteger("pageSize");
 
         if (statisticsType == 1) {
             return iFtOrderDaoService.statisGetOrderOfWeek(selectWeek);
         } else {
-//            return iFtOrderDaoService.statisGetOrderOfWeekByPerson(selectWeek);
+            return iFtOrderDaoService.statisGetOrderOfWeekByPerson(selectWeek, pageNum, pageSize);
-            return null;
         }
 
     }
@@ -166,14 +167,16 @@ public class FtOrderDaoController extends BaseController {
      */
     @PostMapping("/getStatisGetOrderOfMonth")
     public AjaxResult getStatisGetOrderOfMonth(@RequestBody JSONObject params) {
+
         Date selectMonth = params.getDate("selectMonth");
         Integer statisticsType = params.getInteger("statisticsType");
+        Integer pageNum = params.getInteger("pageNum");
+        Integer pageSize = params.getInteger("pageSize");
 
         if (statisticsType == 1) {
             return iFtOrderDaoService.statisGetOrderOfMonth(selectMonth);
         }else {
-//            return iFtOrderDaoService.statisGetOrderOfMonthByPerson(selectMonth);
+            return iFtOrderDaoService.statisGetOrderOfMonthByPerson(selectMonth, pageNum, pageSize);
-            return null;
         }
     }
 }

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

@@ -29,9 +29,9 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
 
     public void GenerateStaffTomorrowOrder() {
         int week = DateUtil.thisDayOfWeek();
-        if (week < 6)
+        if (week < 6) {
             this.baseMapper.GenerateStaffTomorrowOrder();
-
+        }
     }
 
     @Override
@@ -63,11 +63,12 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
         wrapper.eq("order_type", orderType);
         wrapper.between("order_date", DateUtil.beginOfDay(demandDate), DateUtil.endOfDay(demandDate));
         Integer count = this.baseMapper.selectCount(wrapper);
-        if (count > 0)
+        if (count > 0) {
             return -1;
-        else
+        } else {
             return this.baseMapper.insert(dao);
         }
+    }
 
     @Override
     public AjaxResult getAvailableOrder(Integer staffId) {
@@ -143,7 +144,8 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
 
     @Override
     public AjaxResult statisGetOrderOfWeekByPerson(Date date, Integer pageNum, Integer pageSize) {
-        return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfWeek(date).toString(), DateUtil.endOfWeek(date).toString(),   pageNum, pageSize));
+        Integer offset = (pageNum - 1) * pageSize;
+        return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfWeek(date).toString(), DateUtil.endOfWeek(date).toString(), offset, pageSize));
     }
 
     @Override
@@ -153,7 +155,8 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
 
     @Override
     public AjaxResult statisGetOrderOfMonthByPerson(Date date, Integer pageNum, Integer pageSize) {
-        return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfMonth(date).toString(), DateUtil.endOfMonth(date).toString(), pageNum, pageSize));
+        Integer offset = (pageNum - 1) * pageSize;
+        return AjaxResult.success(this.baseMapper.statisGetOrderOfDateByPerson(DateUtil.beginOfMonth(date).toString(), DateUtil.endOfMonth(date).toString(), offset, pageSize));
     }
 
     @Override

ruoyi-ui/src/views/fantang/orderStatistics/index.vue

@@ -74,6 +74,7 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      @pagination="getStatisticsList"
     />
 
   </div>
@@ -133,6 +134,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      // 查询类型
+      selectType: null,
       // 订单管理表格数据
       orderList: [],
       orderCountList: [],
@@ -145,6 +148,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         selectDay: null,
+        selectWeek: null,
+        selectMonth: null,
         statisticsType: null,
       },
       // 表单参数
@@ -160,6 +165,29 @@ export default {
     });
   },
   methods: {
+    getStatisticsList() {
+      if (this.selectType === 1 || this.selectType === '1') {
+        getStatisGetOrderOfDay(this.queryParams).then(response => {
+          console.log(response)
+          this.orderCountList = response.data;
+          this.selectType = 1;
+          this.total = response.total;
+        })
+      } else if (this.selectType === 2 || this.selectType === '2') {
+        getStatisGetOrderOfWeek(this.queryParams).then(response => {
+          console.log(response)
+          this.orderCountList = response.data;
+          this.selectType = 2;
+          this.total = response.total;
+        })
+      } else if (this.selectType === 3 || this.selectType === '3') {
+        getStatisGetOrderOfMonth(this.queryParams).then(response => {
+          this.orderCountList = response.data;
+          this.selectType = 3;
+          this.total = response.total;
+        })
+      }
+    },
     changeStatisticsType(item) {
       console.log(item)
       this.formDay.statisticsType = item;
@@ -190,8 +218,12 @@ export default {
       }
       if (this.formMonth.selectMonth != null && this.formMonth.statisticsType != null) {
         console.log(this.formMonth)
-        getStatisGetOrderOfMonth(this.formMonth).then(response => {
+        this.queryParams.selectMonth = this.formMonth.selectMonth;
+        this.queryParams.statisticsType = this.formMonth.statisticsType;
+        getStatisGetOrderOfMonth(this.queryParams).then(response => {
           this.orderCountList = response.data;
+          this.selectType = 3;
+          this.total = response.total;
         })
       }
     },
@@ -201,9 +233,13 @@ export default {
       }
       if (this.formWeek.selectWeek != null && this.formWeek.statisticsType != null) {
         console.log(this.formWeek)
-        getStatisGetOrderOfWeek(this.formWeek).then(response => {
+        this.queryParams.selectWeek = this.formWeek.selectWeek;
+        this.queryParams.statisticsType = this.formWeek.statisticsType;
+        getStatisGetOrderOfWeek(this.queryParams).then(response => {
           console.log(response)
           this.orderCountList = response.data;
+          this.selectType = 2;
+          this.total = response.total;
         })
       }
     },
@@ -218,6 +254,8 @@ export default {
         getStatisGetOrderOfDay(this.queryParams).then(response => {
           console.log(response)
           this.orderCountList = response.data;
+          this.selectType = 1;
+          // this.total = response.total;
         })
       }
     },