From 23ec64ed997fc206fba9f0d6a84975f7b36c47be Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 11 十月 2026 16:09:26 +0800
Subject: [PATCH] 天津-奇缘恒艺 录数据需求修改
---
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java | 51 +++++++++++++++++++--------------------------------
1 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
index fc9cf4c..517e5ce 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
@@ -1,9 +1,10 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.pojo.PersonalAttendanceLocationConfig;
import com.ruoyi.staff.service.PersonalAttendanceLocationConfigService;
@@ -31,50 +32,36 @@
private final PersonalAttendanceLocationConfigService personalAttendanceLocationConfigService;
@Operation(summary = "鏂板/淇敼浜哄憳鎵撳崱瑙勫垯閰嶇疆")
+ @Log(title = "鏂板/淇敼浜哄憳鎵撳崱瑙勫垯閰嶇疆", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody PersonalAttendanceLocationConfig personalAttendanceLocationConfig){
- if (personalAttendanceLocationConfig.getId() != null
- && !personalAttendanceLocationConfigService.canEdit(personalAttendanceLocationConfig.getId())) {
- return R.fail("璇ョ彮娆￠厤缃凡琚帓鐝苟浜х敓鎵撳崱璁板綍锛屼笉鑳界紪杈�");
- }
- // 鐝闇�瑕佷笉鑳藉閲嶅
- 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, PersonalAttendanceLocationConfig query){
- page.addOrder(OrderItem.desc("id"));
- LambdaQueryWrapper<PersonalAttendanceLocationConfig> wrapper = new LambdaQueryWrapper<PersonalAttendanceLocationConfig>()
- .ne(PersonalAttendanceLocationConfig::getId, 999);
- if (query.getSysDeptId() != null) {
- wrapper.eq(PersonalAttendanceLocationConfig::getSysDeptId, query.getSysDeptId());
- }
- if (query.getShift() != null && !query.getShift().isEmpty()) {
- wrapper.eq(PersonalAttendanceLocationConfig::getShift, query.getShift());
- }
- IPage<PersonalAttendanceLocationConfig> result = personalAttendanceLocationConfigService.page(page, wrapper);
- result.getRecords().forEach(item -> {
- boolean locked = personalAttendanceLocationConfigService.hasAttendanceUsage(item.getId());
- item.setUsageLocked(locked);
- item.setCanEdit(!locked);
- item.setCanDelete(!locked);
- });
- return R.ok(result);
+ 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) {
- for (Integer id : ids) {
- if (!personalAttendanceLocationConfigService.canDelete(id)) {
- return R.fail("瀛樺湪宸叉帓鐝笖宸叉湁鎵撳崱璁板綍鐨勭彮娆￠厤缃紝涓嶈兘鍒犻櫎");
- }
- }
return R.ok(personalAttendanceLocationConfigService.removeBatchByIds(ids));
}
--
Gitblit v1.9.3