From 357eb123c9dcb34a2d4dc002443e88b924e2ec7d Mon Sep 17 00:00:00 2001
From: czx <28353131@qq.com>
Date: Thu, 24 Dec 2020 10:06:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=8F=9C=E5=8D=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fantang/controller/ClientController.java      | 15 +++++++++------
 .../fantang/mapper/FtWeekMenuDaoMapper.java       |  6 ++++--
 .../fantang/service/IFtWeekMenuDaoService.java    |  2 +-
 .../service/impl/FtWeekMenuDaoServiceImpl.java    |  4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

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 1d71eeb6a..ac9d8ccb9 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
@@ -216,13 +216,16 @@ public class ClientController extends BaseController {
         return null;
     }
 
+    /**
+     * 初始化员工订餐配置文件，并返回初始化后的记录给前端
+     * params: staffId
+     * return
+     */
     @PostMapping("/initDemandMode")
     public AjaxResult initDemandMode(@RequestBody JSONObject params) {
         return staffDemandDaoService.initDemandMode(params.getLong("staffId"));
     }
 
-
-
     /**
      * 设置订餐模式
      * 日期：2020年12月11日
@@ -243,18 +246,18 @@ public class ClientController extends BaseController {
     }
 
     /**
-     * 获取当天菜谱
+     * 返回某天的菜单
      * param  today
      * return
      */
-    @GetMapping("/getTodayMenu")
-    public AjaxResult getTodayMenu(@RequestBody JSONObject params) {
+    @PostMapping("/getMenuOfDay")
+    public AjaxResult getMenuOfDay(@RequestBody JSONObject params) {
         String[] weekDays = { "周日", "周一", "周二", "周三", "周四", "周五", "周六" };
         Calendar cal = Calendar.getInstance();
         cal.setTime(params.getDate("date"));
         int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
         if (w < 0)
             w = 0;
-        return weekMenuDaoService.getTodayMenu(weekDays[w]);
+        return weekMenuDaoService.getMenuOfDay(weekDays[w]);
     }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtWeekMenuDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtWeekMenuDaoMapper.java
index 14c2639b4..6bc3865b1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtWeekMenuDaoMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtWeekMenuDaoMapper.java
@@ -1,10 +1,12 @@
 package com.ruoyi.system.fantang.mapper;
 
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.fantang.domain.FtWeekMenuDao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * 每周菜单Mapper接口
  *
@@ -16,5 +18,5 @@ public interface FtWeekMenuDaoMapper extends BaseMapper<FtWeekMenuDao> {
     // 非聚合方式转换参考
     // SELECT a.weekday, a.dinner_type,  CONCAT(b.name ) name FROM ft_week_menu a LEFT JOIN ft_food b ON FIND_IN_SET(b.food_id,a.foods) WHERE a.weekday = '周一'
     @Select("SELECT a.weekday, a.dinner_type,  GROUP_CONCAT(b.name ) name FROM ft_week_menu a LEFT JOIN ft_food b ON FIND_IN_SET(b.food_id,a.foods) WHERE a.weekday = #{weekDay} GROUP BY a.dinner_type")
-    AjaxResult getTodayMenu(String weekDay);
+    List<FtWeekMenuDao> getTodayMenu(@Param("weekDay")String weekDay);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtWeekMenuDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtWeekMenuDaoService.java
index 4610c45fe..a33d4935f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtWeekMenuDaoService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtWeekMenuDaoService.java
@@ -12,5 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IFtWeekMenuDaoService extends IService<FtWeekMenuDao> {
 
-    AjaxResult getTodayMenu(String weekDay);
+    AjaxResult getMenuOfDay(String weekDay);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtWeekMenuDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtWeekMenuDaoServiceImpl.java
index 9be28d942..fd1bed76e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtWeekMenuDaoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtWeekMenuDaoServiceImpl.java
@@ -17,7 +17,7 @@ import com.ruoyi.system.fantang.service.IFtWeekMenuDaoService;
 public class FtWeekMenuDaoServiceImpl extends ServiceImpl<FtWeekMenuDaoMapper, FtWeekMenuDao> implements IFtWeekMenuDaoService {
 
     @Override
-    public AjaxResult getTodayMenu(String weekDay) {
-        return this.baseMapper.getTodayMenu(weekDay);
+    public AjaxResult getMenuOfDay(String weekDay) {
+        return AjaxResult.success(this.baseMapper.getTodayMenu(weekDay));
     }
 }