From 1fb4735cf75f6b98b8d81611a95ccea395cba323 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 20 四月 2026 16:35:04 +0800
Subject: [PATCH] 绩效模块调整
---
ruoyi-admin-ztns/src/main/java/com/ruoyi/web/controller/system/UserController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin-ztns/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin-ztns/src/main/java/com/ruoyi/web/controller/system/UserController.java
index f8756bd..7c81c07 100644
--- a/ruoyi-admin-ztns/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-admin-ztns/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -1,15 +1,21 @@
package com.ruoyi.web.controller.system;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.service.UserService;
import com.ruoyi.web.controller.dto.UpdateUserDto;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
@@ -36,6 +42,12 @@
@GetMapping("/selectUserCondition")
public Result selectUserCondition(User user, String type, Integer departmentId) {
return Result.success(userService.selectUserCondition(user, type, departmentId));
+ }
+
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃-缁╂晥妯″潡鐢�")
+ @GetMapping("/selectUserListByPerformance")
+ public Result selectUserListByPerformance(@RequestParam(required = false,defaultValue = "false") Boolean isTestUser){
+ return Result.success(userService.selectUserListByPerformance(isTestUser));
}
/**
@@ -70,6 +82,20 @@
return Result.success(userService.delUserDepardLimsId(id));
}
+ @ApiOperation(value = "鏌ヨ鎵�鏈夌敤鎴峰垪琛�")
+ @GetMapping("/selectAllUser")
+ public Result selectAllUser(){
+ return Result.success(userService.list(Wrappers.<User>lambdaQuery().eq(User::getStatus,0)));
+ }
+
+ /**
+ * 鏇存柊鐢ㄦ埛鎺掑簭
+ */
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
+ @PostMapping("/updateUserSort")
+ public Result updateUserSort(@RequestBody List<User> sysUserList){
+ return Result.success(userService.updateBatchById(sysUserList));
+ }
}
--
Gitblit v1.9.3