新增员工停餐接口
This commit is contained in:
parent
6675d80a92
commit
96b6b349dc
@ -82,6 +82,21 @@ public class ClientController extends BaseController {
|
|||||||
return AjaxResult.success(orderDaoService.getAvailableOrder(staffId));
|
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日
|
* 日期:2020年12月11日
|
||||||
@ -127,6 +142,21 @@ public class ClientController extends BaseController {
|
|||||||
return orderDaoService.cancelOrder(params.getLong("orderId"));
|
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}")
|
@GetMapping("/getConfiguration/{staffId}")
|
||||||
public AjaxResult getConfiguration(@PathVariable("staffId") Long staffId) {
|
public AjaxResult getConfiguration(@PathVariable("staffId") Long staffId) {
|
||||||
|
@ -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;
|
||||||
|
}
|
@ -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<FtStaffStopMealsDao> {
|
||||||
|
|
||||||
|
}
|
@ -25,4 +25,8 @@ public interface IFtOrderDaoService extends IService<FtOrderDao> {
|
|||||||
AjaxResult stopOrder(Long staffId, Integer orderType, Date demandDate);
|
AjaxResult stopOrder(Long staffId, Integer orderType, Date demandDate);
|
||||||
|
|
||||||
AjaxResult cancelOrder(Long orderId);
|
AjaxResult cancelOrder(Long orderId);
|
||||||
|
|
||||||
|
AjaxResult getAvailableStopOrder(Long staffId);
|
||||||
|
|
||||||
|
AjaxResult cancelStopOrder(Long orderId);
|
||||||
}
|
}
|
||||||
|
@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.ruoyi.common.core.domain.AjaxResult;
|
import com.ruoyi.common.core.domain.AjaxResult;
|
||||||
import com.ruoyi.system.fantang.domain.FtOrderDao;
|
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.FtOrderDaoMapper;
|
||||||
|
import com.ruoyi.system.fantang.mapper.FtStaffStopMealsDaoMapper;
|
||||||
import com.ruoyi.system.fantang.service.IFtOrderDaoService;
|
import com.ruoyi.system.fantang.service.IFtOrderDaoService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@ -21,6 +24,9 @@ import java.util.List;
|
|||||||
@Service
|
@Service
|
||||||
public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrderDao> implements IFtOrderDaoService {
|
public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrderDao> implements IFtOrderDaoService {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
FtStaffStopMealsDaoMapper staffStopMealsDaoMapper;
|
||||||
|
|
||||||
public void GenerateStaffTomorrowOrder() {
|
public void GenerateStaffTomorrowOrder() {
|
||||||
this.baseMapper.GenerateStaffTomorrowOrder();
|
this.baseMapper.GenerateStaffTomorrowOrder();
|
||||||
|
|
||||||
@ -72,7 +78,12 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult stopOrder(Long staffId, Integer orderType, Date demandDate) {
|
public AjaxResult stopOrder(Long staffId, Integer orderType, Date demandDate) {
|
||||||
return null;
|
FtStaffStopMealsDao dao = new FtStaffStopMealsDao();
|
||||||
|
dao.setStaffId(staffId);
|
||||||
|
dao.setType(orderType);
|
||||||
|
dao.setDemandDate(demandDate);
|
||||||
|
dao.setCreateAt(new Date());
|
||||||
|
return AjaxResult.success(staffStopMealsDaoMapper.insert(dao));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -81,4 +92,16 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
|
|||||||
dao.setOrderId(orderId);
|
dao.setOrderId(orderId);
|
||||||
return AjaxResult.success(this.baseMapper.deleteById(dao));
|
return AjaxResult.success(this.baseMapper.deleteById(dao));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AjaxResult getAvailableStopOrder(Long staffId) {
|
||||||
|
QueryWrapper<FtStaffStopMealsDao> 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));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user