Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

昨天 dbd7fd484b5c7ed00cb895f227645848c3677c08

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

@@ -1,16 +1,12 @@
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.domain.R;
import com.ruoyi.staff.dto.PersonalAttendanceRecordsDto;
import com.ruoyi.staff.pojo.PersonalAttendanceLocationConfig;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.service.PersonalAttendanceLocationConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;
@@ -25,26 +21,32 @@
 */
@RestController
@RequestMapping("/personalAttendanceLocationConfig")
@Api(tags = "人员打卡规则配置")
@Tag(name = "人员打卡规则配置")
@RequiredArgsConstructor
public class PersonalAttendanceLocationConfigController {

    @Autowired
    private PersonalAttendanceLocationConfigService personalAttendanceLocationConfigService;
    private final PersonalAttendanceLocationConfigService personalAttendanceLocationConfigService;

    @ApiOperation("新增/修改人员打卡规则配置")
    @Operation(summary = "新增/修改人员打卡规则配置")
    @PostMapping("/add")
    public R add(@RequestBody PersonalAttendanceLocationConfig personalAttendanceLocationConfig){


        // 班次需要不能够重复
        if (personalAttendanceLocationConfig.getId() == null && personalAttendanceLocationConfigService.lambdaQuery().eq(PersonalAttendanceLocationConfig::getShift, personalAttendanceLocationConfig.getShift()).one() != null) {
            return R.fail("班次不能重复");
        }
        return R.ok(personalAttendanceLocationConfigService.saveOrUpdate(personalAttendanceLocationConfig));
    }

    @ApiOperation("分页查询人员打卡规则配置")
    @Operation(summary = "分页查询人员打卡规则配置")
    @GetMapping("/listPage")
    public R listPage(Page page){
        return R.ok(personalAttendanceLocationConfigService.page(page));
    }


    @ApiOperation("删除人员打卡规则配置")
    @Operation(summary = "删除人员打卡规则配置")
    @DeleteMapping("/del")
    public R del(@RequestBody List<Integer> ids) {
        return R.ok(personalAttendanceLocationConfigService.removeBatchByIds(ids));