绩效模块调整

zouyu

2026-04-20 1fb4735cf75f6b98b8d81611a95ccea395cba323

 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;


@@ -27,16 +33,21 @@
    private UserService userService;

    /**
     * todo:  type : 1: 获取检测人员信息
              type : 2: 获取当前登录用户部门下的所有用户
     *
     * @param user
     * @param type
     * @param type 1: 获取检测人员信息,2: 获取当前登录用户部门下的所有用户
     * @return
     */
    @ApiOperation(value = "根据条件获取用户列表")
    @GetMapping("/selectUserCondition")
    public Result selectUserCondition(User user, String type){
        return Result.success(userService.selectUserCondition(user, type));
    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));
    }

    /**
@@ -71,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));
    }

}