From ce0651907f18a57dae80065e01589e975530f53e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 18:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFeasibilityStudyReportController.java | 223 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 170 insertions(+), 53 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 82f0929..29490ee 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
@@ -6,27 +6,34 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.enums.*;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.FeasibilityReportFileEnum;
+import com.ruoyi.common.enums.FeasibilityStudyReportStatusEnum;
+import com.ruoyi.common.enums.StudyReportTypeEnum;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditStatusDTO;
import com.ruoyi.system.dto.TFeasibilityStudyReportDTO;
-import com.ruoyi.system.model.*;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.model.TFeasibilityReportFile;
+import com.ruoyi.system.model.TFeasibilityStudyReport;
+import com.ruoyi.system.model.TProjectTeam;
+import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.query.TFeasibilityStudyReportQuery;
-import com.ruoyi.system.service.TFeasibilityReportFileService;
-import com.ruoyi.system.service.TFeasibilityStudyReportService;
-import com.ruoyi.system.service.TProjectTeamService;
-import com.ruoyi.system.service.TProjectTeamStaffService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TFeasibilityStudyReportVO;
+import io.jsonwebtoken.lang.Collections;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -38,7 +45,7 @@
*/
@Api(tags = "可研、可行、工艺开发工具、验证发布报告管理")
@RestController
-@RequestMapping("/t-feasibility-study-report")
+@RequestMapping("")
public class TFeasibilityStudyReportController {
private final TFeasibilityStudyReportService feasibilityStudyReportService;
@@ -46,30 +53,89 @@
private final TokenService tokenService;
private final TProjectTeamService projectTeamService;
private final TProjectTeamStaffService projectTeamStaffService;
+ private final ISysUserService sysUserService;
+ private final SysUserMapper sysUserMapper;
@Autowired
- public TFeasibilityStudyReportController(TFeasibilityStudyReportService feasibilityStudyReportService, TFeasibilityReportFileService feasibilityReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService) {
+ public TFeasibilityStudyReportController(TFeasibilityStudyReportService feasibilityStudyReportService, TFeasibilityReportFileService feasibilityReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, SysUserMapper sysUserMapper) {
this.feasibilityStudyReportService = feasibilityStudyReportService;
this.feasibilityReportFileService = feasibilityReportFileService;
this.tokenService = tokenService;
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
+ this.sysUserService = sysUserService;
+ this.sysUserMapper = sysUserMapper;
}
/**
* 获取可研、可行、工艺开发工具、验证发布报告管理列表
*/
- @PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:list')")
+ //@PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:list')")
@ApiOperation(value = "获取可研、可行、工艺开发工具、验证发布报告管理分页列表",response = TFeasibilityStudyReportQuery.class)
@PostMapping(value = "/api/t-feasibility-study-report/pageList")
public R<PageInfo<TFeasibilityStudyReportVO>> pageList(@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.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(map);
}
/**
* 添加可研、可行、工艺开发工具、验证发布报告管理管理
*/
- @PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:add')")
+ //@PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:add')")
@Log(title = "可研、可行、工艺开发工具、验证发布报告管理信息-新增可研、可行、工艺开发工具、验证发布报告管理", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加可研、可行、工艺开发工具、验证发布报告管理",response = TFeasibilityStudyReportDTO.class)
@PostMapping(value = "/api/t-feasibility-study-report/add")
@@ -117,24 +183,26 @@
feasibilityStudyReportService.save(dto);
// 添加检测报告文件
List<TFeasibilityReportFile> feasibilityReportFiles = dto.getFeasibilityReportFiles();
- for (TFeasibilityReportFile feasibilityReportFile : feasibilityReportFiles) {
- feasibilityReportFile.setReportId(dto.getId());
- switch (FeasibilityReportFileEnum.fromCode(feasibilityReportFile.getReportType())) {
- case FEASIBILITY_STUDY_REPORT:
- feasibilityReportFile.setReportType(FeasibilityReportFileEnum.FEASIBILITY_STUDY_REPORT.getCode());
- break;
- case FEASIBLE_REPORT:
- feasibilityReportFile.setReportType(FeasibilityReportFileEnum.FEASIBLE_REPORT.getCode());
- break;
- case PROCESS_DEVELOPMENT_TOOLS:
- feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROCESS_DEVELOPMENT_TOOLS.getCode());
- break;
- case VERIFICATION_RELEASE:
- feasibilityReportFile.setReportType(FeasibilityReportFileEnum.VERIFICATION_RELEASE.getCode());
- break;
- default:
- feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROJECT_PROPOSAL.getCode());
- break;
+ if(!Collections.isEmpty(feasibilityReportFiles)){
+ for (TFeasibilityReportFile feasibilityReportFile : feasibilityReportFiles) {
+ feasibilityReportFile.setReportId(dto.getId());
+ switch (FeasibilityReportFileEnum.fromCode(feasibilityReportFile.getReportType())) {
+ case FEASIBILITY_STUDY_REPORT:
+ feasibilityReportFile.setReportType(FeasibilityReportFileEnum.FEASIBILITY_STUDY_REPORT.getCode());
+ break;
+ case FEASIBLE_REPORT:
+ feasibilityReportFile.setReportType(FeasibilityReportFileEnum.FEASIBLE_REPORT.getCode());
+ break;
+ case PROCESS_DEVELOPMENT_TOOLS:
+ feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROCESS_DEVELOPMENT_TOOLS.getCode());
+ break;
+ case VERIFICATION_RELEASE:
+ feasibilityReportFile.setReportType(FeasibilityReportFileEnum.VERIFICATION_RELEASE.getCode());
+ break;
+ default:
+ feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROJECT_PROPOSAL.getCode());
+ break;
+ }
}
}
feasibilityReportFileService.saveBatch(feasibilityReportFiles);
@@ -144,7 +212,7 @@
/**
* 修改可研、可行、工艺开发工具、验证发布报告管理
*/
- @PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:edit')")
+ //@PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:edit')")
@Log(title = "可研、可行、工艺开发工具、验证发布报告管理信息-修改可研、可行、工艺开发工具、验证发布报告管理", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改可研、可行、工艺开发工具、验证发布报告管理")
@PostMapping(value = "/api/t-feasibility-study-report/update")
@@ -155,24 +223,26 @@
.eq(TFeasibilityReportFile::getReportId, dto.getId()));
// 添加检测报告文件
List<TFeasibilityReportFile> feasibilityReportFiles = dto.getFeasibilityReportFiles();
- for (TFeasibilityReportFile feasibilityReportFile : feasibilityReportFiles) {
- feasibilityReportFile.setReportId(dto.getId());
- switch (FeasibilityReportFileEnum.fromCode(feasibilityReportFile.getReportType())) {
- case FEASIBILITY_STUDY_REPORT:
- feasibilityReportFile.setReportType(FeasibilityReportFileEnum.FEASIBILITY_STUDY_REPORT.getCode());
- break;
- case FEASIBLE_REPORT:
- feasibilityReportFile.setReportType(FeasibilityReportFileEnum.FEASIBLE_REPORT.getCode());
- break;
- case PROCESS_DEVELOPMENT_TOOLS:
- feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROCESS_DEVELOPMENT_TOOLS.getCode());
- break;
- case VERIFICATION_RELEASE:
- feasibilityReportFile.setReportType(FeasibilityReportFileEnum.VERIFICATION_RELEASE.getCode());
- break;
- default:
- feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROJECT_PROPOSAL.getCode());
- break;
+ if(!Collections.isEmpty(feasibilityReportFiles)){
+ for (TFeasibilityReportFile feasibilityReportFile : feasibilityReportFiles) {
+ feasibilityReportFile.setReportId(dto.getId());
+ switch (FeasibilityReportFileEnum.fromCode(feasibilityReportFile.getReportType())) {
+ case FEASIBILITY_STUDY_REPORT:
+ feasibilityReportFile.setReportType(FeasibilityReportFileEnum.FEASIBILITY_STUDY_REPORT.getCode());
+ break;
+ case FEASIBLE_REPORT:
+ feasibilityReportFile.setReportType(FeasibilityReportFileEnum.FEASIBLE_REPORT.getCode());
+ break;
+ case PROCESS_DEVELOPMENT_TOOLS:
+ feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROCESS_DEVELOPMENT_TOOLS.getCode());
+ break;
+ case VERIFICATION_RELEASE:
+ feasibilityReportFile.setReportType(FeasibilityReportFileEnum.VERIFICATION_RELEASE.getCode());
+ break;
+ default:
+ feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROJECT_PROPOSAL.getCode());
+ break;
+ }
}
}
feasibilityReportFileService.saveBatch(feasibilityReportFiles);
@@ -182,7 +252,7 @@
/**
* 查看可研、可行、工艺开发工具、验证发布报告管理详情
*/
- @PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:detail')")
+ //@PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:detail')")
@ApiOperation(value = "查看可研、可行、工艺开发工具、验证发布报告管理详情")
@GetMapping(value = "/open/t-feasibility-study-report/getDetailById")
public R<TFeasibilityStudyReportVO> getDetailById(@RequestParam String id) {
@@ -193,13 +263,22 @@
List<TFeasibilityReportFile> feasibilityReportFiles = feasibilityReportFileService.list(Wrappers.lambdaQuery(TFeasibilityReportFile.class)
.eq(TFeasibilityReportFile::getReportId, id));
feasibilityStudyReportVO.setFeasibilityReportFiles(feasibilityReportFiles);
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(feasibilityStudyReport.getTeamId());
+ // 查询项目组成员
+ List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeam.getId()));
+ List<Long> userIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getUserId).collect(Collectors.toList());
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ feasibilityStudyReportVO.setStaffNames(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
+ feasibilityStudyReportVO.setProjectTeam(projectTeam);
return R.ok(feasibilityStudyReportVO);
}
/**
* 删除可研、可行、工艺开发工具、验证发布报告管理
*/
- @PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:delete')")
@Log(title = "可研、可行、工艺开发工具、验证发布报告管理信息-删除可研、可行、工艺开发工具、验证发布报告管理", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除可研、可行、工艺开发工具、验证发布报告管理")
@DeleteMapping(value = "/open/t-feasibility-study-report/deleteById")
@@ -212,7 +291,7 @@
/**
* 批量删除可研、可行、工艺开发工具、验证发布报告管理
*/
- @PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:delete')")
+ //@PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:delete')")
@Log(title = "可研、可行、工艺开发工具、验证发布报告管理信息-删除可研、可行、工艺开发工具、验证发布报告管理", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除可研、可行、工艺开发工具、验证发布报告管理")
@DeleteMapping(value = "/open/t-feasibility-study-report/deleteByIds")
@@ -225,7 +304,7 @@
/**
* 撤销可研、可行、工艺开发工具、验证发布报告管理
*/
- @PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:revokedReport')")
+ //@PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:revokedReport')")
@Log(title = "可研、可行、工艺开发工具、验证发布报告管理信息-撤销可研、可行、工艺开发工具、验证发布报告管理状态", businessType = BusinessType.UPDATE)
@ApiOperation(value = "撤销可研、可行、工艺开发工具、验证发布报告管理状态")
@PutMapping(value = "/open/t-feasibility-study-report/revokedReport")
@@ -239,7 +318,7 @@
/**
* 审核可研、可行、工艺开发工具、验证发布报告管理
*/
- @PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:auditReport')")
+ //@PreAuthorize("@ss.hasPermi('system:feasibilityStudyReport:auditReport')")
@Log(title = "可研、可行、工艺开发工具、验证发布报告管理信息-审核可研、可行、工艺开发工具、验证发布报告管理状态", businessType = BusinessType.UPDATE)
@ApiOperation(value = "审核可研、可行、工艺开发工具、验证发布报告管理状态")
@PostMapping(value = "/api/t-feasibility-study-report/auditReport")
@@ -254,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