From e01edd535b5de81a7ad70f7eb061e48af5f84d6f Mon Sep 17 00:00:00 2001
From: czx <28353131@qq.com>
Date: Thu, 24 Dec 2020 14:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=9F=E8=AE=A1=E5=8D=95?=
 =?UTF-8?q?=E6=97=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/fantang/controller/ClientController.java   | 5 +++++
 .../java/com/ruoyi/system/fantang/domain/FtOrderDao.java    | 3 +++
 .../com/ruoyi/system/fantang/mapper/FtOrderDaoMapper.java   | 6 ++++++
 .../ruoyi/system/fantang/service/IFtOrderDaoService.java    | 2 ++
 .../system/fantang/service/impl/FtOrderDaoServiceImpl.java  | 5 +++++
 5 files changed, 21 insertions(+)

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 88ad2a36b..d99692f6e 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
@@ -260,4 +260,9 @@ public class ClientController extends BaseController {
             w = 0;
         return weekMenuDaoService.getMenuOfDay(weekDays[w]);
     }
+
+    @GetMapping("/StatisGetOrderOfDate")
+    public AjaxResult statisGetOrderOfDate(@RequestParam Date date) {
+        return orderDaoService.statisGetOrderOfDate(date);
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtOrderDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtOrderDao.java
index aed3a5a23..e0914c464 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtOrderDao.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtOrderDao.java
@@ -141,4 +141,7 @@ public class FtOrderDao implements Serializable {
 
     // 订用餐日期
     private Date orderDate;
+
+    @TableField(exist = false)
+    private Integer countOrder;
 }
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 dde186b00..37b28a280 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
@@ -3,7 +3,10 @@ package com.ruoyi.system.fantang.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.fantang.domain.FtOrderDao;
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -16,4 +19,7 @@ public interface FtOrderDaoMapper extends BaseMapper<FtOrderDao> {
 
     @Insert("insert into ft_order (order_type, staff_id, order_src, create_at, order_date, order_list, total_price) select type as order_type, staff_id, 1 as order_src, now() as create_at, date_add(now(), interval 1 day) as order_date, foods, (select sum(price) from ft_food f where FIND_IN_SET(f.food_id,d.foods)) as price from ft_staff_demand d where d.demand_mode = 1")
     void GenerateStaffTomorrowOrder();
+
+    @Select("select order_type, count(*)  as count_order from ft_order where order_date BETWEEN #{start} and #{end} GROUP BY order_type")
+    List<FtOrderDao> statisGetOrderOfDate(@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 4c6f3f6fe..68907b864 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
@@ -29,4 +29,6 @@ public interface IFtOrderDaoService extends IService<FtOrderDao> {
     AjaxResult getAvailableStopOrder(Long staffId);
 
     AjaxResult cancelStopOrder(Long orderId);
+
+    AjaxResult statisGetOrderOfDate(Date date);
 }
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 e388943a0..dbcc5274d 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
@@ -106,4 +106,9 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
     public AjaxResult cancelStopOrder(Long orderId) {
         return AjaxResult.success(staffStopMealsDaoMapper.deleteById(orderId));
     }
+
+    @Override
+    public AjaxResult statisGetOrderOfDate(Date date) {
+        return AjaxResult.success(this.baseMapper.statisGetOrderOfDate(DateUtil.beginOfDay(date).toString(), DateUtil.endOfDay(date).toString()));
+    }
 }