From 5f825db5800bd2b7311990c2c8d62881e399bde9 Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Thu, 24 Dec 2020 09:17:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E5=91=98=E5=B7=A5=E9=85=8D=E7=BD=AE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fantang/controller/ClientController.java | 8 ++++++++ .../fantang/mapper/FtStaffDemandDaoMapper.java | 4 ++++ .../service/IFtStaffDemandDaoService.java | 2 ++ .../impl/FtStaffDemandDaoServiceImpl.java | 17 +++++++++++++++++ 4 files changed, 31 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 45e4150a4..1d71eeb6a 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 @@ -2,6 +2,7 @@ package com.ruoyi.system.fantang.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.system.fantang.service.*; @@ -215,6 +216,13 @@ public class ClientController extends BaseController { return null; } + @PostMapping("/initDemandMode") + public AjaxResult initDemandMode(@RequestBody JSONObject params) { + return staffDemandDaoService.initDemandMode(params.getLong("staffId")); + } + + + /** * 设置订餐模式 * 日期：2020年12月11日 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffDemandDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffDemandDaoMapper.java index 9a98ecdc2..c047de9da 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffDemandDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffDemandDaoMapper.java @@ -1,7 +1,9 @@ package com.ruoyi.system.fantang.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.system.fantang.domain.FtStaffDemandDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Insert; /** * 员工报餐Mapper接口 @@ -11,4 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface FtStaffDemandDaoMapper extends BaseMapper { + @Insert("INSERT into ft_staff_demand (staff_id, type, demand_mode) VALUES (#{staffId}, 1, 0),(#{staffId}, 2, 0),(#{staffId}, 3, 0)") + Integer initDemandMode(Long staffId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffDemandDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffDemandDaoService.java index fb40fa0fc..850f19071 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffDemandDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffDemandDaoService.java @@ -15,4 +15,6 @@ public interface IFtStaffDemandDaoService extends IService { AjaxResult getConfiguration(Long staffId); AjaxResult setDemandMode(Long id, Integer type, Boolean demandModeFlag); + + AjaxResult initDemandMode(Long staffId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffDemandDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffDemandDaoServiceImpl.java index dcbb4f977..858005de6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffDemandDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffDemandDaoServiceImpl.java @@ -8,7 +8,9 @@ import com.ruoyi.system.fantang.mapper.FtStaffDemandDaoMapper; import com.ruoyi.system.fantang.domain.FtStaffDemandDao; import com.ruoyi.system.fantang.service.IFtStaffDemandDaoService; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 员工报餐Service业务层处理 @@ -42,4 +44,19 @@ public class FtStaffDemandDaoServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("staff_id", staffId); + int ret = this.baseMapper.deleteByMap(map); + // 初始化三条订餐配置信息 + this.baseMapper.initDemandMode(staffId); + + // 重新检索返回给前端 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("staff_id", staffId); + return AjaxResult.success(this.baseMapper.selectList(wrapper)); + } + } 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 2/5] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=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 { // 非聚合方式转换参考 // 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 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 { - 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 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)); } } From 32cbe06ec61a697eed6b54b3835f955174aa3ae0 Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Thu, 24 Dec 2020 11:17:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=9C=89=E6=95=88=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E8=BF=94=E5=9B=9E=E4=BB=8A=E5=A4=A9=E4=BB=A5=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fantang/controller/ClientController.java | 2 +- .../service/impl/FtOrderDaoServiceImpl.java | 1 + .../impl/FtStaffInfoDaoServiceImpl.java | 26 ++++++++++++------- 3 files changed, 18 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 ac9d8ccb9..88ad2a36b 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 @@ -93,7 +93,7 @@ public class ClientController extends BaseController { * param JSONObject staffId: 员工id * return */ - @GetMapping("/getAvailableStopOrder") + @PostMapping("/getAvailableStopOrder") public AjaxResult getAvailableStopOrder(@RequestBody JSONObject params) { return AjaxResult.success(orderDaoService.getAvailableStopOrder(params.getLong("staffId"))); } 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 57baec15f..e33f49adf 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 @@ -63,6 +63,7 @@ public class FtOrderDaoServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("staff_id", staffId); + wrapper.ge("order_date", new Date()); List daos = this.baseMapper.selectList(wrapper); return AjaxResult.success(daos); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java index dddd442f0..06a4bda38 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java @@ -28,16 +28,22 @@ public class FtStaffInfoDaoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tel", tel); - queryWrapper.eq("password", password); - FtStaffInfoDao dao = this.baseMapper.selectOne(queryWrapper); - if (dao == null) - return AjaxResult.error(-1, "查无记录"); - dao.setLoginFlag(true); - dao.setToken(IdUtils.fastUUID()); - this.baseMapper.updateById(dao); - return AjaxResult.success(dao); + // 查询是否有该员工 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("tel", tel); + FtStaffInfoDao dao = this.baseMapper.selectOne(wrapper); + if (dao == null) { + return AjaxResult.error(-2, "无该员工信息"); + } else { + wrapper.eq("password", password); + dao = this.baseMapper.selectOne(wrapper); + if (dao == null) + return AjaxResult.error(-1, "密码错误"); + dao.setLoginFlag(true); + dao.setToken(IdUtils.fastUUID()); + this.baseMapper.updateById(dao); + return AjaxResult.success(dao); + } } @Override From 69785a0388b1e9302f71860e1a327d1101838bd1 Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Thu, 24 Dec 2020 12:29:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=9C=89=E6=95=88?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/fantang/service/impl/FtOrderDaoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e33f49adf..e388943a0 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 @@ -63,7 +63,7 @@ public class FtOrderDaoServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("staff_id", staffId); - wrapper.ge("order_date", new Date()); + wrapper.ge("order_date", DateUtil.beginOfDay(new Date())); List daos = this.baseMapper.selectList(wrapper); return AjaxResult.success(daos); } 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 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8D=95=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 { @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 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 { 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