From bef478693e0e1ed4b33f15fa62b2339ebff2235e Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Fri, 22 Jan 2021 10:49:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=97=85=E6=82=A3=E6=8A=A5?= =?UTF-8?q?=E9=A4=90=E6=8C=89=E6=97=A5=E6=9C=9F=E7=BB=9F=E8=AE=A1=E7=94=A8?= =?UTF-8?q?=E9=A4=90=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ClientPatientController.java | 13 +++++++++++++ .../fantang/mapper/FtReportMealsDaoMapper.java | 9 +++++++++ .../fantang/service/IFtReportMealsDaoService.java | 3 ++- .../service/impl/FtReportMealsDaoServiceImpl.java | 6 ++++++ .../ruoyi/system/fantang/vo/FtReportMealVo.java | 15 +-------------- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java index d7ef323a8..c7d334718 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java @@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.system.fantang.domain.*; import com.ruoyi.system.fantang.service.*; import com.ruoyi.system.fantang.vo.FtPatientVo; +import com.ruoyi.system.fantang.vo.FtReportMealVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -204,4 +205,16 @@ public class ClientPatientController extends BaseController { return AjaxResult.success(list); } + + /** + * 按照用餐类型统计指定日期的各菜品数量 + * @author 陈智兴 + * @param day:查询日期 + * @return + */ + @GetMapping("/getStatisticsFoods") + public AjaxResult getStatisticsFoods(@RequestParam("departId") Integer departId, @RequestParam("date") Date day) { + List list = iFtReportMealsDaoService.getStatisticsFoods(departId, day); + return AjaxResult.success(list); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealsDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealsDaoMapper.java index cc499cc6f..73287baf0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealsDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealsDaoMapper.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.fantang.domain.FtReportMealsDao; import com.ruoyi.system.fantang.entity.ReportMealsPriceEntity; +import com.ruoyi.system.fantang.vo.FtReportMealVo; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; @@ -42,4 +43,12 @@ public interface FtReportMealsDaoMapper extends BaseMapper { List listNutrition(@Param("beginOfDay") DateTime beginOfDay, @Param("endOfDay") DateTime endOfDay, FtReportMealsDao ftReportMealsDao); List listAllNutrition(FtReportMealsDao ftReportMealsDao); + + @Select("SELECT a.type, a.foods, count(a.foods) as count, b.depart_id,c.depart_name\n" + + "from ft_report_meals 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 b.depart_id = #{departId} and a.dining_at BETWEEN #{beginOfDay} and #{endOfDay}\n" + + "GROUP BY a.type, foods") + List getStatisticsFoods(@Param("departId") Integer departId, @Param("beginOfDay") DateTime beginOfDay, @Param("endOfDay") DateTime endOfDay); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java index 713561d63..5fc817a55 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java @@ -6,7 +6,6 @@ import com.ruoyi.system.fantang.entity.ReportMealsDayEntity; import com.ruoyi.system.fantang.entity.ReportMealsPriceEntity; import com.ruoyi.system.fantang.vo.FtReportMealVo; -import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -37,5 +36,7 @@ public interface IFtReportMealsDaoService extends IService { List listNutrition(FtReportMealsDao ftReportMealsDao); List listAllNutrition(FtReportMealsDao ftReportMealsDao); + + List getStatisticsFoods(Integer departId, Date day); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java index f562c49d5..f238d85cc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java @@ -129,4 +129,10 @@ public class FtReportMealsDaoServiceImpl extends ServiceImpl listAllNutrition(FtReportMealsDao ftReportMealsDao) { return this.baseMapper.listAllNutrition(ftReportMealsDao); } + + @Override + public List getStatisticsFoods(Integer departId, Date day) { + return this.baseMapper.getStatisticsFoods(departId, DateUtil.beginOfDay(day), DateUtil.endOfDay(day)); + + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java index abf4563dc..fae09e6c0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java @@ -37,19 +37,6 @@ public class FtReportMealVo extends FtReportMealsDao { private String departCode; -// private Date createAt; -// -// private Integer type; -// -// private Long patientId; -// -// private String createBy; -// -// private String foods; -// -// private float price; -// -// private Integer settlementFlag; -// + private Integer count; }