From 2aee85ae1b25dd547d342fd11ccad659d232d0d5 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Mon, 11 Jan 2021 09:00:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=A4=90=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FtOrderDaoController.java      | 16 +++++++------
 ruoyi-ui/src/api/fantang/order.js             | 12 +++++-----
 .../views/fantang/orderStatistics/index.vue   | 24 +++++++++++++++++++
 3 files changed, 39 insertions(+), 13 deletions(-)

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 c1e2d54cc..614cbbe16 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
@@ -130,7 +130,6 @@ public class FtOrderDaoController extends BaseController {
      */
     @PostMapping("/getStatisGetOrderOfDay")
     public AjaxResult getStatisGetOrderOfDay(@RequestBody JSONObject params) {
-        System.out.println(params);
         Date selectDay = params.getDate("selectDay");
         return iFtOrderDaoService.statisGetOrderOfDate(selectDay);
     }
@@ -138,16 +137,19 @@ public class FtOrderDaoController extends BaseController {
     /**
      * 统计周报餐信息
      */
-    @GetMapping("/getStatisGetOrderOfWeek")
-    public AjaxResult getStatisGetOrderOfWeek(@RequestParam Date date) {
-        return iFtOrderDaoService.statisGetOrderOfWeek(date);
+    @PostMapping("/getStatisGetOrderOfWeek")
+    public AjaxResult getStatisGetOrderOfWeek(@RequestBody JSONObject params) {
+        System.out.println(params);
+        Date selectWeek = params.getDate("selectWeek");
+        return iFtOrderDaoService.statisGetOrderOfWeek(selectWeek);
     }
 
     /**
      * 统计月报餐信息
      */
-    @GetMapping("/getStatisGetOrderOfMonth")
-    public AjaxResult getStatisGetOrderOfMonth(@RequestParam Date date) {
-        return iFtOrderDaoService.statisGetOrderOfMonth(date);
+    @PostMapping("/getStatisGetOrderOfMonth")
+    public AjaxResult getStatisGetOrderOfMonth(@RequestBody JSONObject params) {
+        Date selectMonth = params.getDate("selectMonth");
+        return iFtOrderDaoService.statisGetOrderOfMonth(selectMonth);
     }
 }
diff --git a/ruoyi-ui/src/api/fantang/order.js b/ruoyi-ui/src/api/fantang/order.js
index 0f2201830..379d885a4 100644
--- a/ruoyi-ui/src/api/fantang/order.js
+++ b/ruoyi-ui/src/api/fantang/order.js
@@ -62,19 +62,19 @@ export function getStatisGetOrderOfDay(data) {
 }
 
 // 周报餐信息
-export function getStatisGetOrderOfWeek() {
+export function getStatisGetOrderOfWeek(data) {
   return request({
     url: '/fantang/order/getStatisGetOrderOfWeek',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: data
   })
 }
 
 // 月报餐信息
-export function getStatisGetOrderOfMonth() {
+export function getStatisGetOrderOfMonth(data) {
   return request({
     url: '/fantang/order/getStatisGetOrderOfMonth',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: data
   })
 }
diff --git a/ruoyi-ui/src/views/fantang/orderStatistics/index.vue b/ruoyi-ui/src/views/fantang/orderStatistics/index.vue
index f67ff6d21..fa546afce 100644
--- a/ruoyi-ui/src/views/fantang/orderStatistics/index.vue
+++ b/ruoyi-ui/src/views/fantang/orderStatistics/index.vue
@@ -43,6 +43,9 @@
       <el-form-item>
         <el-button type="primary" @click="onMonthSubmit">统计</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-button @click="resetCount">重置</el-button>
+      </el-form-item>
     </el-form>
 
 
@@ -200,6 +203,8 @@ import {
   exportOrder,
   getOrder,
   getStatisGetOrderOfDay,
+  getStatisGetOrderOfMonth,
+  getStatisGetOrderOfWeek,
   listOrder,
   updateOrder
 } from "@/api/fantang/order";
@@ -266,17 +271,36 @@ export default {
     });
   },
   methods: {
+    resetCount() {
+      this.formDay = {
+        selectDay: null
+      }
+      this.formWeek = {
+        selectWeek: null
+      }
+      this.formMonth = {
+        selectMonth: null
+      }
+      this.orderCountList = null
+    },
     formatOrderType(row) {
       return this.selectDictLabel(this.typeOptions, row.orderType);
     },
     onMonthSubmit() {
       if (this.formMonth.selectMonth != null) {
         console.log(this.formMonth)
+        getStatisGetOrderOfMonth(this.formMonth).then(response => {
+          this.orderCountList = response.data;
+        })
       }
     },
     onWeekSubmit() {
       if (this.formWeek.selectWeek != null) {
         console.log(this.formWeek)
+        getStatisGetOrderOfWeek(this.formWeek).then(response => {
+          console.log(response)
+          this.orderCountList = response.data;
+        })
       }
     },
     onDaySubmit() {