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 c8f568f2c..c93586602 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 @@ -82,6 +82,21 @@ public class ClientController extends BaseController { return AjaxResult.success(orderDaoService.getAvailableOrder(staffId)); } + + /** + * 获取员工停餐信息 + * 日期:2020年12月21日 + * 作者:陈智兴 + * + * param JSONObject staffId: 员工id + * return + */ + @GetMapping("/getAvailableStopOrder") + public AjaxResult getAvailableStopOrder(@RequestBody JSONObject params) { + return AjaxResult.success(orderDaoService.getAvailableStopOrder(params.getLong("staffId"))); + } + + /** * 推送订单信息 * 日期:2020年12月11日 @@ -127,6 +142,21 @@ public class ClientController extends BaseController { return orderDaoService.cancelOrder(params.getLong("orderId")); } + /** + * 推送取消停餐信息 + * 日期:2020年12月21日 + * 作者:陈智兴 + * + * param staffId: 员工id + * type:订餐类型 + * demandDate: 订餐用餐日期 + * return -1: 已报停餐信息, 1: 停餐成功 + */ + @PostMapping("/postCancelStopOrder") + public AjaxResult postCancelStopOrder(@RequestBody JSONObject params) { + return AjaxResult.success(orderDaoService.cancelStopOrder(params.getLong("orderId"))); + } + // 获取配置信息 @GetMapping("/getConfiguration/{staffId}") public AjaxResult getConfiguration(@PathVariable("staffId") Long staffId) { 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 new file mode 100644 index 000000000..e1bd20d40 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffStopMealsDao.java @@ -0,0 +1,54 @@ +package com.ruoyi.system.fantang.domain; + +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 lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Date; + +/** + * 员工报餐对象 ft_staff_demand + * + * @author ft + * @date 2020-12-07 + */ +@Data +@ToString +@EqualsAndHashCode +@NoArgsConstructor +@Accessors(chain = true) +@TableName("ft_staff_stop_meals") +public class FtStaffStopMealsDao implements Serializable { + +private static final long serialVersionUID=1L; + + + /** id */ + @TableId(value = "id") + private Long id; + + /** 员工 id */ + @Excel(name = "员工 id") + private Long staffId; + + /** 用餐类型 */ + @Excel(name = "用餐类型") + private Integer type; + + /** 创建时间 */ + @Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createAt; + + /** 停餐时间 */ + @Excel(name = "停餐时间" , width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date demandDate; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffStopMealsDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffStopMealsDaoMapper.java new file mode 100644 index 000000000..3bab09a41 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffStopMealsDaoMapper.java @@ -0,0 +1,16 @@ +package com.ruoyi.system.fantang.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.fantang.domain.FtStaffStopMealsDao; +import org.springframework.stereotype.Repository; + +/** + * 员工报餐Mapper接口 + * + * @author ft + * @date 2020-12-07 + */ +@Repository +public interface FtStaffStopMealsDaoMapper extends BaseMapper { + +} 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 6e492d9ef..4c6f3f6fe 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 @@ -25,4 +25,8 @@ public interface IFtOrderDaoService extends IService { AjaxResult stopOrder(Long staffId, Integer orderType, Date demandDate); AjaxResult cancelOrder(Long orderId); + + AjaxResult getAvailableStopOrder(Long staffId); + + AjaxResult cancelStopOrder(Long orderId); } 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 619999c22..2fd7cf0b0 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 @@ -5,8 +5,11 @@ 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.FtOrderDao; +import com.ruoyi.system.fantang.domain.FtStaffStopMealsDao; import com.ruoyi.system.fantang.mapper.FtOrderDaoMapper; +import com.ruoyi.system.fantang.mapper.FtStaffStopMealsDaoMapper; import com.ruoyi.system.fantang.service.IFtOrderDaoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; @@ -21,6 +24,9 @@ import java.util.List; @Service public class FtOrderDaoServiceImpl extends ServiceImpl implements IFtOrderDaoService { + @Autowired + FtStaffStopMealsDaoMapper staffStopMealsDaoMapper; + public void GenerateStaffTomorrowOrder() { this.baseMapper.GenerateStaffTomorrowOrder(); @@ -72,7 +78,12 @@ public class FtOrderDaoServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("staff_id", staffId); + return AjaxResult.success(staffStopMealsDaoMapper.selectList(wrapper)); + } + + @Override + public AjaxResult cancelStopOrder(Long orderId) { + return AjaxResult.success(staffStopMealsDaoMapper.deleteById(orderId)); + } }