From cb37071da177c4b1645ab4109731710c1a7fdddc Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 09 十月 2026 21:15:40 +0800
Subject: [PATCH] 天津-奇缘恒艺 1.录数据需求修改
---
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
index aa40835..517e5ce 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
@@ -1,17 +1,16 @@
package com.ruoyi.staff.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
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.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -30,28 +29,37 @@
@RequiredArgsConstructor
public class PersonalAttendanceLocationConfigController {
- private PersonalAttendanceLocationConfigService personalAttendanceLocationConfigService;
+ private final PersonalAttendanceLocationConfigService personalAttendanceLocationConfigService;
@Operation(summary = "鏂板/淇敼浜哄憳鎵撳崱瑙勫垯閰嶇疆")
+ @Log(title = "鏂板/淇敼浜哄憳鎵撳崱瑙勫垯閰嶇疆", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody PersonalAttendanceLocationConfig personalAttendanceLocationConfig){
- // 鐝闇�瑕佷笉鑳藉閲嶅
- if (personalAttendanceLocationConfig.getId() == null && personalAttendanceLocationConfigService.lambdaQuery().eq(PersonalAttendanceLocationConfig::getShift, personalAttendanceLocationConfig.getShift()).one() != null) {
- return R.fail("鐝涓嶈兘閲嶅");
+ // 鍚屼竴閮ㄩ棬鍐呯彮娆′笉鑳介噸澶嶏紙涓嶅悓閮ㄩ棬鍙娇鐢ㄥ悓鍚嶇彮娆★級
+ if (personalAttendanceLocationConfig.getId() == null
+ && personalAttendanceLocationConfigService.lambdaQuery()
+ .eq(PersonalAttendanceLocationConfig::getSysDeptId, personalAttendanceLocationConfig.getSysDeptId())
+ .eq(PersonalAttendanceLocationConfig::getShift, personalAttendanceLocationConfig.getShift())
+ .one() != null) {
+ return R.fail("璇ラ儴闂ㄤ笅璇ョ彮娆′笉鑳介噸澶�");
}
return R.ok(personalAttendanceLocationConfigService.saveOrUpdate(personalAttendanceLocationConfig));
}
@Operation(summary = "鍒嗛〉鏌ヨ浜哄憳鎵撳崱瑙勫垯閰嶇疆")
@GetMapping("/listPage")
- public R listPage(Page page){
- return R.ok(personalAttendanceLocationConfigService.page(page));
+ public R listPage(Page page, Integer sysDeptId, String shift){
+ LambdaQueryWrapper<PersonalAttendanceLocationConfig> qw = Wrappers.lambdaQuery();
+ qw.eq(sysDeptId != null, PersonalAttendanceLocationConfig::getSysDeptId, sysDeptId);
+ qw.like(shift != null && !shift.isEmpty(), PersonalAttendanceLocationConfig::getShift, shift);
+ return R.ok(personalAttendanceLocationConfigService.page(page, qw));
}
@Operation(summary = "鍒犻櫎浜哄憳鎵撳崱瑙勫垯閰嶇疆")
+ @Log(title = "鍒犻櫎浜哄憳鎵撳崱瑙勫垯閰嶇疆", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
public R del(@RequestBody List<Integer> ids) {
return R.ok(personalAttendanceLocationConfigService.removeBatchByIds(ids));
--
Gitblit v1.9.3