From f90b70b4448c8930c752111504b857b5fb76e8e3 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 25 六月 2025 11:08:41 +0800 Subject: [PATCH] bug修改 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java index 3b261e1..a771b69 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java @@ -30,6 +30,7 @@ import java.time.LocalDateTime; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; @@ -113,6 +114,30 @@ } /** + * 获取中试、生产验证分析报告;辅料;产品报告管理评定列表 + */ + //@PreAuthorize("@ss.hasPermi('system:qaProduceReport:evaluateList')") + @ApiOperation(value = "获取中试、生产验证分析报告;辅料;产品报告管理评定数量统计", response = TQaProduceReportQuery.class) + @PostMapping(value = "/api/t-qa-produce-report/evaluateCount") + public R<Map<String,Integer>> evaluateCount(@RequestBody String param) { + TQaProduceReportQuery query = JSON.parseObject(param, TQaProduceReportQuery.class); + Long userId = tokenService.getLoginUser().getUserId(); + Integer roleType = tokenService.getLoginUser().getUser().getRoleType(); + if(roleType != 1){ + // 查询用户所在项目组 + List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class) + .eq(TProjectTeamStaff::getUserId, userId)); + if(projectTeamStaffs.size() > 0){ + // 查询项目组id + List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList()); + query.setTeamIds(teamIds); + } + } + Map<String,Integer> map = qaProduceReportService.evaluateCount(query); + return R.ok(map); + } + + /** * 添加中试、生产验证分析报告;辅料;产品报告管理管理 */ //@PreAuthorize("@ss.hasPermi('system:qaProduceReport:add')") -- Gitblit v1.7.1