Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

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

@@ -1,7 +1,8 @@
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.dto.PersonalAttendanceRecordsDto;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.service.PersonalAttendanceRecordsService;
@@ -23,26 +24,26 @@
@RestController
@RequestMapping("/personalAttendanceRecords")
@Tag(name = "人员打卡签到")
public class PersonalAttendanceRecordsController {
public class PersonalAttendanceRecordsController extends BaseController {
    @Resource
    private PersonalAttendanceRecordsService personalAttendanceRecordsService;

    @Operation(summary = "新增打卡签到")
    @PostMapping("")
    public AjaxResult add(@RequestBody PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
        return AjaxResult.success(personalAttendanceRecordsService.add(personalAttendanceRecordsDto));
    public R<?> add(@RequestBody PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
        return R.ok(personalAttendanceRecordsService.add(personalAttendanceRecordsDto));
    }

    @Operation(summary = "分页查询打卡签到")
    @GetMapping("/listPage")
    public AjaxResult listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
        return AjaxResult.success(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
    public R<?> listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
        return R.ok(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
    }

    @Operation(summary = "获取当前人的考勤相关数据")
    @GetMapping("/today")
    public AjaxResult todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
        return AjaxResult.success(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
    public R<?> todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
        return R.ok(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
    }

    @Operation(summary = "导出打卡签到")