From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治
---
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java | 38 ++++++++------------------------------
1 files changed, 8 insertions(+), 30 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..be2c171 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java
@@ -1,9 +1,8 @@
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.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,12 +30,11 @@
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("鐝涓嶈兘閲嶅");
@@ -46,35 +44,15 @@
@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){
+ return R.ok(personalAttendanceLocationConfigService.page(page));
}
@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