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/StaffSchedulingController.java

@@ -5,7 +5,8 @@
import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
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.dto.SaveStaffSchedulingDto;
import com.ruoyi.staff.dto.StaffSchedulingDto;
import com.ruoyi.staff.service.StaffSchedulingService;
@@ -26,39 +27,39 @@
@RestController
@RequestMapping("/staff/staffScheduling")
@RequiredArgsConstructor
public class StaffSchedulingController {
public class StaffSchedulingController extends BaseController {

    private final StaffSchedulingService staffSchedulingService;

    @PostMapping("/listPage")
    public AjaxResult listPage(@RequestBody SearchSchedulingVo vo){
       return AjaxResult.success(staffSchedulingService.listPage(vo));
    public R<?> listPage(@RequestBody SearchSchedulingVo vo){
       return R.ok(staffSchedulingService.listPage(vo));
    }

    @PostMapping("/save")
    public AjaxResult save(@RequestBody @Validated SaveStaffSchedulingDto saveStaffSchedulingDto){
    public R<?> save(@RequestBody @Validated SaveStaffSchedulingDto saveStaffSchedulingDto){
        staffSchedulingService.saveStaffScheduling(saveStaffSchedulingDto);
        return AjaxResult.success();
        return R.ok();
    }

    @DeleteMapping("/delByIds")
    public AjaxResult delByIds(@RequestBody List<Integer> ids){
    public R<?> delByIds(@RequestBody List<Integer> ids){
        staffSchedulingService.removeByIds(ids);
        return AjaxResult.success();
        return R.ok();
    }

    @DeleteMapping("/del/{id}")
    public AjaxResult del(@PathVariable("id") Integer id){
    public R<?> del(@PathVariable("id") Integer id){
        staffSchedulingService.removeById(id);
        return AjaxResult.success();
        return R.ok();
    }

    /**
     * 获取当前用户最新排班记录
     */
    @GetMapping("/getCurrentUserLatestScheduling")
    public AjaxResult getCurrentUserLatestScheduling(){
        return AjaxResult.success(staffSchedulingService.getCurrentUserLatestScheduling());
    public R<?> getCurrentUserLatestScheduling(){
        return R.ok(staffSchedulingService.getCurrentUserLatestScheduling());
    }

    @Log(title = "导出人员排班列表", businessType = BusinessType.EXPORT)