From ab2844e5bd6b901bb20eed46117e84d828b8ac8b Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Fri, 3 Jan 2025 10:36:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(examine):=20=E8=80=83=E6=A0=B8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ExamineDetailController 和 ExamineUserController 中添加了权限控制注解 - 在 ExamineUser 中添加了 userName 和 isAsc 字段 - 修改了 ExamineUserMapper.xml 以支持用户昵称查询和排序功能 - 优化了查询参数验证逻辑 --- .../detail/ExamineDetailController.java | 2 ++ .../examine/user/ExamineUserController.java | 10 ++++++ .../examine/user/domain/ExamineUser.java | 2 ++ .../business/examine/ExamineUserMapper.xml | 32 ++++++++++++------- 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/detail/ExamineDetailController.java b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/detail/ExamineDetailController.java index 2c8cafb..c171eb3 100644 --- a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/detail/ExamineDetailController.java +++ b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/detail/ExamineDetailController.java @@ -2,6 +2,7 @@ package tech.unissense.pms.web.controller.business.examine.detail; import cn.hutool.core.lang.Assert; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import tech.unissense.pms.business.examine.config.domain.ExamineConfig; import tech.unissense.pms.business.examine.config.enums.ReviewTypeEnum; import tech.unissense.pms.business.examine.config.service.ExamineConfigService; @@ -63,6 +64,7 @@ public class ExamineDetailController extends BaseController { } @GetMapping + @PreAuthorize("@ss.hasPermi('examine:manager:list')") public AjaxResult list(ExamineDetailRequestDto dto) { Assert.notNull(dto.getExamineTaskId(), "考核任务ID不能为空"); // Assert.notNull(dto.getExamineId(), "考核ID不能为空"); diff --git a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/user/ExamineUserController.java b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/user/ExamineUserController.java index 8674d86..8979ffe 100644 --- a/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/user/ExamineUserController.java +++ b/pms-admin/src/main/java/tech/unissense/pms/web/controller/business/examine/user/ExamineUserController.java @@ -1,5 +1,7 @@ package tech.unissense.pms.web.controller.business.examine.user; +import cn.hutool.core.util.StrUtil; +import org.springframework.security.access.prepost.PreAuthorize; import tech.unissense.pms.business.examine.user.domain.ExamineUser; import tech.unissense.pms.business.examine.user.service.ExamineUserService; import org.springframework.data.domain.Page; @@ -8,6 +10,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import tech.unissense.pms.common.core.controller.BaseController; import tech.unissense.pms.common.core.page.TableDataInfo; +import tech.unissense.pms.common.exception.ServiceException; import javax.annotation.Resource; @@ -47,7 +50,14 @@ public class ExamineUserController extends BaseController { * @date 2025/01/02 10:36 */ @GetMapping + @PreAuthorize("@ss.hasPermi('examine:manager:list')") public TableDataInfo queryPage(ExamineUser examineUser) { + if (StrUtil.isNotEmpty(examineUser.getIsAsc())) { + //判断参数是否合法 + if (!"ASC".equalsIgnoreCase(examineUser.getIsAsc()) && !"DESC".equalsIgnoreCase(examineUser.getIsAsc())) { + throw new ServiceException("参数不合法"); + } + } startPage(); return getDataTable(examineUserService.list(examineUser)); } diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java index 7081cfe..cecfc79 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java @@ -24,6 +24,7 @@ public class ExamineUser implements Serializable { * 考核人 */ private Integer userId; + private String userName; /** * 考核分数(权重后分数) */ @@ -47,6 +48,7 @@ public class ExamineUser implements Serializable { private String deptId; + private String isAsc; } diff --git a/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml b/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml index c16b7f2..b65957c 100644 --- a/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml +++ b/pms-business/src/main/resources/mapper/business/examine/ExamineUserMapper.xml @@ -58,37 +58,47 @@ - + select t1.id, + t1.task_id, + t1.user_id, + t1.score, + t1.judge_content, + t1.manage_score, + t1.examine_status, + t1.examine_status_self, + t2.nick_name as userName + from pms_examine_user t1 left join sys_user t2 on t1.user_id = t2.user_id - and id = #{id} + and t1.id = #{id} - and task_id = #{taskId} + and t1.task_id = #{taskId} - and user_id = #{userId} + and t1.user_id = #{userId} - and score = #{score} + and t1.score = #{score} - and judge_content = #{judgeContent} + and t1.judge_content = #{judgeContent} - and manage_score = #{manageScore} + and t1.manage_score = #{manageScore} - and examine_status = #{examineStatus} + and t1.examine_status = #{examineStatus} - and examine_status_self = #{examineStatusSelf} + and t1.examine_status_self = #{examineStatusSelf} - and user_id in (select id from sys_user where dept_id = #{deptId}) + and t2.dept_id = #{deptId} + order by ifnull(manage_score,-1) ${isAsc}