From 20739d95d85d5d6744690093a061292325ce4a9b Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 19 五月 2025 14:10:27 +0800 Subject: [PATCH] 项目总积分 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java | 82 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java index 7cf5eca..d36c0f2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java @@ -31,6 +31,7 @@ import java.time.LocalDateTime; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; @@ -86,6 +87,49 @@ } } return R.ok(feasibilityStudyReportService.pageList(query)); + } + + /** + * 获取可研、可行、工艺开发工具、验证发布报告管理列表 + */ + //@PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:evaluatePageList')") + @ApiOperation(value = "获取专业报告课题评定分页列表-超管、审批人",response = TFeasibilityStudyReportQuery.class) + @PostMapping(value = "/api/t-feasibility-study-report/evaluatePageList") + public R<PageInfo<TFeasibilityStudyReportVO>> evaluatePageList(@RequestBody String param) { + TFeasibilityStudyReportQuery query = JSON.parseObject(param, TFeasibilityStudyReportQuery.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); + } + } + return R.ok(feasibilityStudyReportService.evaluatePageList(query)); + } + + @ApiOperation(value = "获取专业报告课题评定数量统计",response = TFeasibilityStudyReportQuery.class) + @PostMapping(value = "/api/t-feasibility-study-report/evaluateCount") + public R<Map<String,Integer>> evaluateCount(@RequestBody String param) { + TFeasibilityStudyReportQuery query = JSON.parseObject(param, TFeasibilityStudyReportQuery.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 = feasibilityStudyReportService.evaluateCount(query); + return R.ok(); } /** @@ -289,6 +333,44 @@ feasibilityStudyReportService.updateById(feasibilityStudyReport); return R.ok(); } + + /** + * 课题评定-进行评定 + */ + //@PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:evaluate')") + @Log(title = "课题评定-进行评定", businessType = BusinessType.UPDATE) + @ApiOperation(value = "课题评定") + @PutMapping(value = "/open/t-feasibility-study-report/evaluate") + public R<Boolean> evaluate(@RequestParam(value = "id") String id, + @RequestParam(value = "evaluateScore") String evaluateScore) { + Long userId = tokenService.getLoginUser().getUserId(); + TFeasibilityStudyReport feasibilityStudyReport = feasibilityStudyReportService.getById(id); + feasibilityStudyReport.setStatus(3); + feasibilityStudyReport.setEvaluatePersonId(userId); + feasibilityStudyReport.setEvaluateTime(LocalDateTime.now()); + feasibilityStudyReport.setEvaluateScore(evaluateScore); + feasibilityStudyReportService.updateById(feasibilityStudyReport); + return R.ok(); + } + + /** + * 课题评定-评定详情 + */ + //@PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:evaluate')") + @Log(title = "课题评定-评定详情", businessType = BusinessType.UPDATE) + @ApiOperation(value = "评定详情") + @GetMapping(value = "/open/t-feasibility-study-report/evaluateDetail") + public R<TFeasibilityStudyReportVO> evaluateDetail(@RequestParam(value = "id") String id) { + TFeasibilityStudyReport feasibilityStudyReport = feasibilityStudyReportService.getById(id); + TFeasibilityStudyReportVO tFeasibilityStudyReportVO = new TFeasibilityStudyReportVO(); + BeanUtils.copyProperties(feasibilityStudyReport, tFeasibilityStudyReportVO); + // 查询评定人员名称 + SysUser sysUser = sysUserService.selectUserById(feasibilityStudyReport.getEvaluatePersonId()); + if(Objects.nonNull(sysUser)){ + tFeasibilityStudyReportVO.setEvaluatePersonName(sysUser.getNickName()); + } + return R.ok(tFeasibilityStudyReportVO); + } } -- Gitblit v1.7.1