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/TProjectApprovalReportController.java | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 229 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java
index 595d801..abfce32 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java
@@ -1,9 +1,41 @@
package com.ruoyi.web.controller.api;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+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.ProjectApprovalReportStatusEnum;
+import com.ruoyi.common.enums.StudyReportTypeEnum;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.AuditStatusDTO;
+import com.ruoyi.system.dto.TProjectApprovalReportDTO;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.model.TFeasibilityReportFile;
+import com.ruoyi.system.model.TProjectApprovalReport;
+import com.ruoyi.system.model.TProjectTeam;
+import com.ruoyi.system.model.TProjectTeamStaff;
+import com.ruoyi.system.query.TProjectApprovalReportQuery;
+import com.ruoyi.system.service.TFeasibilityReportFileService;
+import com.ruoyi.system.service.TProjectApprovalReportService;
+import com.ruoyi.system.service.TProjectTeamService;
+import com.ruoyi.system.service.TProjectTeamStaffService;
+import com.ruoyi.system.vo.TProjectApprovalReportVO;
+import io.jsonwebtoken.lang.Collections;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -15,8 +47,202 @@
*/
@Api(tags = "立项报告管理")
@RestController
-@RequestMapping("/t-project-approval-report")
+@RequestMapping("")
public class TProjectApprovalReportController {
+ private final TProjectApprovalReportService projectApprovalReportService;
+ private final TFeasibilityReportFileService feasibilityReportFileService;
+ private final TokenService tokenService;
+ private final TProjectTeamService projectTeamService;
+ private final TProjectTeamStaffService projectTeamStaffService;
+ private final SysUserMapper sysUserMapper;
+ @Autowired
+ public TProjectApprovalReportController(TProjectApprovalReportService projectApprovalReportService, TFeasibilityReportFileService feasibilityReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, SysUserMapper sysUserMapper) {
+ this.projectApprovalReportService = projectApprovalReportService;
+ this.feasibilityReportFileService = feasibilityReportFileService;
+ this.tokenService = tokenService;
+ this.projectTeamService = projectTeamService;
+ this.projectTeamStaffService = projectTeamStaffService;
+ this.sysUserMapper = sysUserMapper;
+ }
+
+ /**
+ * 获取立项报告列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:projectApprovalReport:list')")
+ @ApiOperation(value = "获取立项报告分页列表",response = TProjectApprovalReportQuery.class)
+ @PostMapping(value = "/api/t-project-approval-report/pageList")
+ public R<PageInfo<TProjectApprovalReportVO>> pageList(@RequestBody String param) {
+ TProjectApprovalReportQuery query = JSON.parseObject(param, TProjectApprovalReportQuery.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(projectApprovalReportService.pageList(query));
+ }
+
+ /**
+ * 添加立项报告管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:projectApprovalReport:add')")
+ @Log(title = "立项报告信息-新增立项报告", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加立项报告",response = TProjectApprovalReportDTO.class)
+ @PostMapping(value = "/api/t-project-approval-report/add")
+ public R<Boolean> add(@RequestBody String param) {
+ TProjectApprovalReportDTO dto = JSON.parseObject(param,TProjectApprovalReportDTO.class);
+ // 通过当前用户查询项目组
+ Long userId = tokenService.getLoginUser().getUserId();
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .last("LIMIT 1"));
+ if(Objects.isNull(projectTeamStaff)){
+ return R.fail("当前用户未分配项目组,无法创建项目课题方案");
+ }
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ if(Objects.isNull(projectTeam)){
+ return R.fail("项目组不存在");
+ }
+ if(projectTeam.getStatus() == 2){
+ return R.fail("项目组已封存,无法创建项目课题方案");
+ }
+ // 生成可研、可行、工艺开发工具、验证发布报告编号
+ String reportCode = projectTeam.getTeamName() + "-" + StudyReportTypeEnum.VERIFICATION_RELEASE.getCode();
+ // 查询上个项目课题方案的序号
+ long count = projectApprovalReportService.count(Wrappers.lambdaQuery(TProjectApprovalReport.class)
+ .like(TProjectApprovalReport::getReportCode, reportCode));
+ reportCode = reportCode + "-" + String.format("%03d", count+1);
+ dto.setReportCode(reportCode);
+
+ projectApprovalReportService.save(dto);
+ // 添加检测报告文件
+ List<TFeasibilityReportFile> feasibilityReportFiles = dto.getFeasibilityReportFiles();
+ if(!Collections.isEmpty(feasibilityReportFiles)){
+ for (TFeasibilityReportFile feasibilityReportFile : feasibilityReportFiles) {
+ feasibilityReportFile.setReportId(dto.getId());
+ feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROJECT_PROPOSAL.getCode());
+ }
+ }
+ feasibilityReportFileService.saveBatch(feasibilityReportFiles);
+ return R.ok();
+ }
+
+ /**
+ * 修改立项报告
+ */
+ //@PreAuthorize("@ss.hasPermi('system:projectApprovalReport:edit')")
+ @Log(title = "立项报告信息-修改立项报告", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改立项报告")
+ @PostMapping(value = "/api/t-project-approval-report/update")
+ public R<Boolean> update(@RequestBody String param) {
+ TProjectApprovalReportDTO dto = JSON.parseObject(param,TProjectApprovalReportDTO.class);
+ projectApprovalReportService.updateById(dto);
+ feasibilityReportFileService.remove(Wrappers.lambdaQuery(TFeasibilityReportFile.class)
+ .eq(TFeasibilityReportFile::getReportId, dto.getId()));
+ // 添加检测报告文件
+ List<TFeasibilityReportFile> feasibilityReportFiles = dto.getFeasibilityReportFiles();
+ if(!Collections.isEmpty(feasibilityReportFiles)){
+ for (TFeasibilityReportFile feasibilityReportFile : feasibilityReportFiles) {
+ feasibilityReportFile.setReportId(dto.getId());
+ feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROJECT_PROPOSAL.getCode());
+ }
+ }
+ feasibilityReportFileService.saveBatch(feasibilityReportFiles);
+ return R.ok();
+ }
+
+ /**
+ * 查看立项报告详情
+ */
+ //@PreAuthorize("@ss.hasPermi('system:projectApprovalReport:detail')")
+ @ApiOperation(value = "查看立项报告详情")
+ @GetMapping(value = "/open/t-project-approval-report/getDetailById")
+ public R<TProjectApprovalReportVO> getDetailById(@RequestParam String id) {
+ TProjectApprovalReport projectApprovalReport = projectApprovalReportService.getById(id);
+ TProjectApprovalReportVO projectApprovalReportVO = new TProjectApprovalReportVO();
+ BeanUtils.copyProperties(projectApprovalReport, projectApprovalReportVO);
+ // 查询检测报告文件
+ List<TFeasibilityReportFile> feasibilityReportFiles = feasibilityReportFileService.list(Wrappers.lambdaQuery(TFeasibilityReportFile.class)
+ .eq(TFeasibilityReportFile::getReportId, id));
+ projectApprovalReportVO.setFeasibilityReportFiles(feasibilityReportFiles);
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(projectApprovalReport.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);
+ projectApprovalReportVO.setStaffNames(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
+ projectApprovalReportVO.setProjectTeam(projectTeam);
+ return R.ok(projectApprovalReportVO);
+ }
+
+ /**
+ * 删除立项报告
+ */
+ //@PreAuthorize("@ss.hasPermi('system:projectApprovalReport:delete')")
+ @Log(title = "立项报告信息-删除立项报告", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除立项报告")
+ @DeleteMapping(value = "/open/t-project-approval-report/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ // 删除可研、可行、工艺开发工具、验证发布报告文件
+ feasibilityReportFileService.remove(Wrappers.lambdaQuery(TFeasibilityReportFile.class).eq(TFeasibilityReportFile::getReportId, id));
+ return R.ok(projectApprovalReportService.removeById(id));
+ }
+
+ /**
+ * 批量删除立项报告
+ */
+ //@PreAuthorize("@ss.hasPermi('system:projectApprovalReport:delete')")
+ @Log(title = "立项报告信息-删除立项报告", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除立项报告")
+ @DeleteMapping(value = "/open/t-project-approval-report/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ // 删除可研、可行、工艺开发工具、验证发布报告文件
+ feasibilityReportFileService.remove(Wrappers.lambdaQuery(TFeasibilityReportFile.class).in(TFeasibilityReportFile::getReportId, ids));
+ return R.ok(projectApprovalReportService.removeByIds(ids));
+ }
+
+ /**
+ * 撤销立项报告
+ */
+ //@PreAuthorize("@ss.hasPermi('system:projectApprovalReport:revokedReport')")
+ @Log(title = "立项报告信息-撤销立项报告状态", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "撤销立项报告状态")
+ @PutMapping(value = "/open/t-project-approval-report/revokedReport")
+ public R<Boolean> revokedReport(@RequestParam String id) {
+ TProjectApprovalReport projectApprovalReport = projectApprovalReportService.getById(id);
+ projectApprovalReport.setStatus(ProjectApprovalReportStatusEnum.REVOKED.getCode());
+ projectApprovalReportService.updateById(projectApprovalReport);
+ return R.ok();
+ }
+
+ /**
+ * 审核立项报告
+ */
+ //@PreAuthorize("@ss.hasPermi('system:projectApprovalReport:auditReport')")
+ @Log(title = "立项报告信息-审核立项报告状态", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "审核立项报告状态")
+ @PostMapping(value = "/api/t-project-approval-report/auditReport")
+ public R<Boolean> auditReport(@RequestBody String param) {
+ Long userId = tokenService.getLoginUser().getUserId();
+ AuditStatusDTO dto = JSON.parseObject(param,AuditStatusDTO.class);
+ TProjectApprovalReport projectApprovalReport = projectApprovalReportService.getById(dto.getId());
+ projectApprovalReport.setStatus(dto.getAuditStatus());
+ projectApprovalReport.setAuditRemark(dto.getAuditRemark());
+ projectApprovalReport.setAuditPersonId(userId);
+ projectApprovalReport.setAuditTime(LocalDateTime.now());
+ projectApprovalReportService.updateById(projectApprovalReport);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1