Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

6 天以前 d06ef3f44d6dc19dae223ab420165369ea13cc16

 src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java

@@ -1,43 +1,45 @@
package com.ruoyi.staff.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.pojo.HolidayApplication;
import com.ruoyi.staff.service.HolidayApplicationService;
import org.springframework.beans.factory.annotation.Autowired;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("/staff/holidayApplication")
public class HolidayApplicationController {
    @Autowired
@AllArgsConstructor
public class HolidayApplicationController extends BaseController {

    private HolidayApplicationService holidayApplicationService;
    /**
     * 请假申请分页查询
     */
    @GetMapping("/listPage")
    public AjaxResult listPage(Page page, HolidayApplication holidayApplication){
        return AjaxResult.success(holidayApplicationService.listPage(page, holidayApplication));
    public R<?> listPage(Page page, HolidayApplication holidayApplication){
        return R.ok(holidayApplicationService.listPage(page, holidayApplication));
    }
    /**
     * 新增请假申请
     */
    @PostMapping("/add")
    public AjaxResult add(@RequestBody HolidayApplication holidayApplication){
        return AjaxResult.success(holidayApplicationService.save(holidayApplication));
    public R<?> add(@RequestBody HolidayApplication holidayApplication){
        return R.ok(holidayApplicationService.save(holidayApplication));
    }
    /**
     * 修改请假申请
     */
    @PostMapping("/update")
    public AjaxResult update(@RequestBody HolidayApplication holidayApplication){
        return AjaxResult.success(holidayApplicationService.updateById(holidayApplication));
    public R<?> update(@RequestBody HolidayApplication holidayApplication){
        return R.ok(holidayApplicationService.updateById(holidayApplication));
    }
    /**
     * 删除请假申请
     */
    @DeleteMapping("/delete/{id}")
    public AjaxResult delete(@PathVariable("id") Long id){
        return AjaxResult.success(holidayApplicationService.removeById(id));
    public R<?> delete(@PathVariable("id") Long id){
        return R.ok(holidayApplicationService.removeById(id));
    }
}