From 9e62938b1f835e76f66053d6b51e2875beee8193 Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Mon, 21 Dec 2020 11:54:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E8=AE=A2=E9=A4=90=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fantang/controller/ClientController.java | 16 +++++----------- .../system/fantang/mapper/FtOrderDaoMapper.java | 3 --- .../service/IFtStaffDemandDaoService.java | 2 +- .../impl/FtStaffDemandDaoServiceImpl.java | 14 +++++++++----- 4 files changed, 15 insertions(+), 20 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 186afbc20..517b2df64 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 @@ -105,23 +105,16 @@ public class ClientController extends BaseController { return AjaxResult.success(staffDemandDaoService.getConfiguration(staffId)); } - // 推送配置信息 - @PostMapping("/postConfiguration/{staffId}") - public AjaxResult postConfiguration(@PathVariable("staffId") Long staffId) { - - return AjaxResult.success("推送个人配置"); - } - /** - * 设置订餐模式 + * 员工登录 * 日期：2020年12月10日 * 作者： 陈智兴 * 修改：首次创建 * - * @param { tel: 手机号码; + * param { tel: 手机号码; * password： 密码 * } - * @return 返回员工信息 + * return 返回员工信息 */ @GetMapping("/login") public AjaxResult login(String tel, String password) { @@ -192,7 +185,8 @@ public class ClientController extends BaseController { @PostMapping("/setDemandMode") public AjaxResult setDemandMode(@RequestBody JSONObject params) { Long id = params.getLong("id"); + Integer type = params.getInteger("type"); Boolean demandMode = params.getBoolean("demandModeFlag"); - return staffDemandDaoService.setDemandMode(id, demandMode); + return staffDemandDaoService.setDemandMode(id, type, demandMode); } } 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 486929230..dde186b00 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 @@ -16,7 +16,4 @@ 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(); - - - List getOrderOfToday(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 9e46b453f..fb40fa0fc 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 @@ -14,5 +14,5 @@ public interface IFtStaffDemandDaoService extends IService { AjaxResult getConfiguration(Long staffId); - AjaxResult setDemandMode(Long id, Boolean demandModeFlag); + AjaxResult setDemandMode(Long id, Integer type, Boolean demandModeFlag); } 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 22140d422..dcbb4f977 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,6 +8,8 @@ import com.ruoyi.system.fantang.mapper.FtStaffDemandDaoMapper; import com.ruoyi.system.fantang.domain.FtStaffDemandDao; import com.ruoyi.system.fantang.service.IFtStaffDemandDaoService; +import java.util.List; + /** * 员工报餐Service业务层处理 * @@ -21,18 +23,20 @@ public class FtStaffDemandDaoServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("staff_id", staffId); - FtStaffDemandDao dao = this.baseMapper.selectOne(wrapper); - if (dao == null) + List daos = this.baseMapper.selectList(wrapper); + if (daos.size() == 0 ) return AjaxResult.error("获取个人配置信息错误"); - return AjaxResult.success(dao); + return AjaxResult.success(daos); } @Override - public AjaxResult setDemandMode(Long id, Boolean demandMode) { + public AjaxResult setDemandMode(Long id, Integer type, Boolean demandMode) { FtStaffDemandDao dao = new FtStaffDemandDao(); dao.setId(id); dao.setDemandMode(demandMode); - int ret = this.baseMapper.updateById(dao); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("type", type); + int ret = this.baseMapper.update(dao, wrapper); if (ret == 0) return AjaxResult.error("更新订餐状态失败"); return AjaxResult.success();