From ca96acdfd29256dae08522ac072484242da3ba58 Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Thu, 14 Jan 2021 13:55:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=8E=E5=A4=A9=E6=8A=A5?= =?UTF-8?q?=E9=A4=90=E7=9A=84=E9=A2=84=E6=B5=8B=E7=BB=9F=E8=AE=A1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fantang/controller/ClientController.java | 10 ++-- .../system/fantang/domain/FtOrderDao.java | 3 +- .../fantang/domain/FtStaffDemandDao.java | 3 +- .../fantang/domain/FtStaffStopMealsDao.java | 3 +- .../system/fantang/entity/BasePatient.java | 2 + .../system/fantang/entity/BaseStaff.java | 20 ++++++++ .../fantang/mapper/FtOrderDaoMapper.java | 49 +++++++++++++++++++ .../fantang/service/IFtOrderDaoService.java | 9 ++++ .../service/impl/FtOrderDaoServiceImpl.java | 18 +++++++ 9 files changed, 110 insertions(+), 7 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BaseStaff.java 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 522e6fe65..29628d006 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 @@ -540,11 +540,13 @@ public class ClientController extends BaseController { */ @GetMapping("/getStatisticsOrderOfTomorrow") public AjaxResult getStatisticsReportMealsOfTomorrow() { + AjaxResult result = new AjaxResult(); + result.success(); + result.put("reports", orderDaoService.getStatisticsReportMealsOfTomorrow()); + result.put("staffs", orderDaoService.getStatisticsStaffOfTomorrow()); + result.put("stops", orderDaoService.getStopOrderOfTomorrow()); - Date today = new Date(); - Date tomorrow = DateUtil.offsetDay(today, 1); - - return orderDaoService.statisGetOrderOfDate(tomorrow); + return result; } 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 af8d5f7bd..53f1318fa 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; +import com.ruoyi.system.fantang.entity.BaseStaff; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -74,7 +75,7 @@ public class FtOrderDao implements Serializable { * 统计总数 */ @TableField(exist = false) - private Integer total; + private Long total; /** * 报餐类型 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffDemandDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffDemandDao.java index f97266f59..971384d18 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffDemandDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffDemandDao.java @@ -1,6 +1,7 @@ package com.ruoyi.system.fantang.domain; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.system.fantang.entity.BaseStaff; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -27,7 +28,7 @@ import com.ruoyi.common.core.domain.BaseEntity; @NoArgsConstructor @Accessors(chain = true) @TableName("ft_staff_demand") -public class FtStaffDemandDao implements Serializable { +public class FtStaffDemandDao extends BaseStaff implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffStopMealsDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffStopMealsDao.java index e1bd20d40..0be67c947 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffStopMealsDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffStopMealsDao.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; +import com.ruoyi.system.fantang.entity.BaseStaff; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -25,7 +26,7 @@ import java.util.Date; @NoArgsConstructor @Accessors(chain = true) @TableName("ft_staff_stop_meals") -public class FtStaffStopMealsDao implements Serializable { +public class FtStaffStopMealsDao extends BaseStaff implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BasePatient.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BasePatient.java index 3daf3a948..1af80d77d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BasePatient.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BasePatient.java @@ -19,4 +19,6 @@ public class BasePatient { public String departName; @TableField(exist = false) private Long departId; + @TableField(exist = false) + private Long total; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BaseStaff.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BaseStaff.java new file mode 100644 index 000000000..5de9a12a9 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BaseStaff.java @@ -0,0 +1,20 @@ +package com.ruoyi.system.fantang.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class BaseStaff { + @TableField(exist = false) + public String name; + @TableField(exist = false) + public String departName; + @TableField(exist = false) + private Long departId; + @TableField(exist = false) + private Long total; +} 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 8859d13e7..1d2cf09b0 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 @@ -1,7 +1,10 @@ package com.ruoyi.system.fantang.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.fantang.domain.FtFoodDemandDao; import com.ruoyi.system.fantang.domain.FtOrderDao; +import com.ruoyi.system.fantang.domain.FtStaffDemandDao; +import com.ruoyi.system.fantang.domain.FtStaffStopMealsDao; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -83,4 +86,50 @@ public interface FtOrderDaoMapper extends BaseMapper { "WHERE\n" + "\tb.type = #{type}") void insertOrderAndWriteOff(@Param("staffId") Long staffId, @Param("type") int type, @Param("deviceId") Long deviceId); + + @Select("SELECT\n" + + "\tc.depart_name,\n" + + "\ta.type,\n" + + "\ta.flag,\n" + + "count(*) as total\n" + + "FROM\n" + + "\tft_food_demand a\n" + + "LEFT JOIN ft_patient b ON a.patient_id = b.patient_id\n" + + "LEFT JOIN ft_depart c ON b.depart_id = c.depart_id\n" + + "WHERE\n" + + "\tb.off_flag = 0\n" + + "AND a.flag = 1\n" + + "GROUP BY a.type, c.depart_name") + List getStatisticsReportMealsOfTomorrow(); + + @Select("SELECT\n" + + "\tc.depart_name,\n" + + "\ta.type,\n" + + "\tcount(*) as total\n" + + "FROM\n" + + "\tft_staff_demand 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\n" + + "WHERE\n" + + "\ta.demand_mode = 1\n" + + "GROUP BY\n" + + "\tc.depart_name,\n" + + "\ta.type") + List getStatisticsStaffOfTomorrow(); + + @Select("SELECT\n" + + "\tc.depart_name,\n" + + "\ta.type,\n" + + "\tcount(*) as total\n" + + "FROM\n" + + "\tft_staff_stop_meals 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\n" + + "WHERE\n" + + "demand_date BETWEEN date_add(NOW(), INTERVAL 1 DAY)\n" + + "AND date_add(now(), INTERVAL 2 DAY)\n" + + "GROUP BY\n" + + "\tc.depart_name,\n" + + "\ta.type\n") + List getStopOrderOfTomorrow(); } 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 657c7e7a0..412a742f0 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 @@ -2,7 +2,10 @@ package com.ruoyi.system.fantang.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.fantang.domain.FtFoodDemandDao; import com.ruoyi.system.fantang.domain.FtOrderDao; +import com.ruoyi.system.fantang.domain.FtStaffDemandDao; +import com.ruoyi.system.fantang.domain.FtStaffStopMealsDao; import java.util.Date; import java.util.List; @@ -48,4 +51,10 @@ public interface IFtOrderDaoService extends IService { List listAllDetailedByDate(String start, String end); String setWriteOff(Long staffId, int type, Long deviceId); + + List getStatisticsReportMealsOfTomorrow(); + + List getStatisticsStaffOfTomorrow(); + + List getStopOrderOfTomorrow(); } 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 6e1229172..b690a3bd8 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 @@ -4,7 +4,9 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.fantang.domain.FtFoodDemandDao; import com.ruoyi.system.fantang.domain.FtOrderDao; +import com.ruoyi.system.fantang.domain.FtStaffDemandDao; import com.ruoyi.system.fantang.domain.FtStaffStopMealsDao; import com.ruoyi.system.fantang.mapper.FtOrderDaoMapper; import com.ruoyi.system.fantang.mapper.FtStaffStopMealsDaoMapper; @@ -203,4 +205,20 @@ public class FtOrderDaoServiceImpl extends ServiceImpl getStatisticsReportMealsOfTomorrow() { + return this.baseMapper.getStatisticsReportMealsOfTomorrow(); + } + + @Override + public List getStatisticsStaffOfTomorrow() { + return this.baseMapper.getStatisticsStaffOfTomorrow(); + + } + + @Override + public List getStopOrderOfTomorrow() { + return this.baseMapper.getStopOrderOfTomorrow(); + } }