From a5bdb5072a5d2322db1d3eca6d585c3e0d79300d Mon Sep 17 00:00:00 2001 From: "28353131@qq.com" <28353131@qq.com> Date: Mon, 28 Dec 2020 23:24:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=AE=A2=E9=A4=90=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/system/fantang/domain/FtOrderDao.java | 3 +++ .../com/ruoyi/system/fantang/mapper/FtOrderDaoMapper.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 e0914c464..1ad4d09d7 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 @@ -144,4 +144,7 @@ public class FtOrderDao implements Serializable { @TableField(exist = false) private Integer countOrder; + + @TableField(exist = false) + private String departName; } 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 37b28a280..ad298361f 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 @@ -20,6 +20,9 @@ public interface FtOrderDaoMapper extends BaseMapper { @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") + @Select("select a.order_type, count(a.order_type) as count_order , c.depart_name from ft_order a\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 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); }