From b7ec3aff011f05e236e76be844540dbe776f7353 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 19:12:03 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 200 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
index e32e42e..0822c93 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
@@ -9,22 +9,23 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TProjectTeamDTO;
import com.ruoyi.system.dto.UpAndDownDTO;
-import com.ruoyi.system.model.TProjectTeam;
-import com.ruoyi.system.model.TProjectTeamStaff;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TProjectTeamQuery;
-import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.TProjectTeamService;
-import com.ruoyi.system.service.TProjectTeamStaffService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TProjectTeamVO;
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.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -42,11 +43,39 @@
private final TProjectTeamService projectTeamService;
private final TProjectTeamStaffService projectTeamStaffService;
private final ISysUserService sysUserService;
+ private final TokenService tokenService;
+ private final TProjectProposalService projectProposalService;
+ private final TExperimentDispatchService experimentDispatchService;
+ private final TTestMethodConfirmSheetService testMethodConfirmSheetService;
+ private final TExperimentSchemeService experimentSchemeService;
+ private final TSamplingRecordService samplingRecordService;
+ private final TExperimentResultReportService experimentResultReportService;
+ private final TQaTestItemService qaTestItemService;
+ private final TQaProduceReportService qaProduceReportService;
+ private final TFeasibilityStudyReportService feasibilityStudyReportService;
+ private final TInspectionReportService inspectionReportService;
+ private final TProjectApprovalReportService projectApprovalReportService;
+ private final TTesterOtherTaskService testerOtherTaskService;
+ private final TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService;
@Autowired
- public TProjectTeamController(TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService) {
+ public TProjectTeamController(TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, TokenService tokenService, TProjectProposalService projectProposalService, TExperimentDispatchService experimentDispatchService, TTestMethodConfirmSheetService testMethodConfirmSheetService, TExperimentSchemeService experimentSchemeService, TSamplingRecordService samplingRecordService, TExperimentResultReportService experimentResultReportService, TQaTestItemService qaTestItemService, TQaProduceReportService qaProduceReportService, TFeasibilityStudyReportService feasibilityStudyReportService, TInspectionReportService inspectionReportService, TProjectApprovalReportService projectApprovalReportService, TTesterOtherTaskService testerOtherTaskService, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService) {
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
this.sysUserService = sysUserService;
+ this.tokenService = tokenService;
+ this.projectProposalService = projectProposalService;
+ this.experimentDispatchService = experimentDispatchService;
+ this.testMethodConfirmSheetService = testMethodConfirmSheetService;
+ this.experimentSchemeService = experimentSchemeService;
+ this.samplingRecordService = samplingRecordService;
+ this.experimentResultReportService = experimentResultReportService;
+ this.qaTestItemService = qaTestItemService;
+ this.qaProduceReportService = qaProduceReportService;
+ this.feasibilityStudyReportService = feasibilityStudyReportService;
+ this.inspectionReportService = inspectionReportService;
+ this.projectApprovalReportService = projectApprovalReportService;
+ this.testerOtherTaskService = testerOtherTaskService;
+ this.testMethodConfirmSheetOriginalService = testMethodConfirmSheetOriginalService;
}
/**
@@ -193,8 +222,173 @@
TProjectTeam projectTeam = projectTeamService.getById(dto.getId());
projectTeam.setStatus(dto.getStatus());
projectTeamService.updateById(projectTeam);
+
+ if(dto.getStatus() == 2){
+ // 封存项目课题方案
+ List<TProjectProposal> projectProposals = projectProposalService.list(Wrappers.lambdaQuery(TProjectProposal.class)
+ .eq(TProjectProposal::getTeamId, dto.getId()));
+ if(!CollectionUtils.isEmpty(projectProposals)){
+ for (TProjectProposal projectProposal : projectProposals) {
+ projectProposal.setOldStatus(projectProposal.getAuditStatus());
+ projectProposal.setAuditStatus(5);
+ }
+ projectProposalService.updateBatchById(projectProposals);
+ List<String> projectIds = projectProposals.stream().map(TProjectProposal::getId).collect(Collectors.toList());
+ // 封存实验调度
+ List<TExperimentDispatch> experimentDispatches = experimentDispatchService.list(Wrappers.lambdaQuery(TExperimentDispatch.class)
+ .in(TExperimentDispatch::getProposalId, projectIds));
+ if(!CollectionUtils.isEmpty(experimentDispatches)){
+ experimentDispatches.forEach(experimentDispatch -> {
+ experimentDispatch.setOldStatus(experimentDispatch.getStatus());
+ experimentDispatch.setStatus(3);
+ });
+ experimentDispatchService.updateBatchById(experimentDispatches);
+
+ // 封存检验方法
+ List<String> dispatchIds = experimentDispatches.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ List<TTestMethodConfirmSheet> testMethodConfirmSheets = testMethodConfirmSheetService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheet.class)
+ .in(TTestMethodConfirmSheet::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(testMethodConfirmSheets)){
+ testMethodConfirmSheets.forEach(testMethodConfirmSheet -> {
+ testMethodConfirmSheet.setOldStatus(testMethodConfirmSheet.getAuditStatus());
+ testMethodConfirmSheet.setAuditStatus(5);
+ });
+ testMethodConfirmSheetService.updateBatchById(testMethodConfirmSheets);
+ }
+
+ // 封存试验方案
+ List<TExperimentScheme> experimentSchemes = experimentSchemeService.list(Wrappers.lambdaQuery(TExperimentScheme.class)
+ .in(TExperimentScheme::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(experimentSchemes)){
+ experimentSchemes.forEach(experimentScheme -> {
+ experimentScheme.setOldStatus(experimentScheme.getStatus());
+ experimentScheme.setStatus(5);
+ });
+ experimentSchemeService.updateBatchById(experimentSchemes);
+ }
+
+ // 封存取样记录
+ List<TSamplingRecord> samplingRecords = samplingRecordService.list(Wrappers.lambdaQuery(TSamplingRecord.class)
+ .in(TSamplingRecord::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(samplingRecords)){
+ samplingRecords.forEach(samplingRecord -> {
+ samplingRecord.setOldStatus(samplingRecord.getStatus());
+ samplingRecord.setStatus(3);
+ });
+ samplingRecordService.updateBatchById(samplingRecords);
+ }
+
+ // 封存结果汇报
+ List<TExperimentResultReport> experimentResultReports = experimentResultReportService.list(Wrappers.lambdaQuery(TExperimentResultReport.class)
+ .in(TExperimentResultReport::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(experimentResultReports)){
+ experimentResultReports.forEach(experimentResultReport -> {
+ experimentResultReport.setOldStatus(experimentResultReport.getStatus());
+ experimentResultReport.setStatus(4);
+ });
+ experimentResultReportService.updateBatchById(experimentResultReports);
+ }
+
+ }
+ }
+ }else {
+ // 解封项目课题方案
+ List<TProjectProposal> projectProposals = projectProposalService.list(Wrappers.lambdaQuery(TProjectProposal.class)
+ .eq(TProjectProposal::getTeamId, dto.getId()));
+ if(!CollectionUtils.isEmpty(projectProposals)){
+ for (TProjectProposal projectProposal : projectProposals) {
+ projectProposal.setAuditStatus(projectProposal.getOldStatus());
+ }
+ projectProposalService.updateBatchById(projectProposals);
+ List<String> projectIds = projectProposals.stream().map(TProjectProposal::getId).collect(Collectors.toList());
+ // 封存实验调度
+ List<TExperimentDispatch> experimentDispatches = experimentDispatchService.list(Wrappers.lambdaQuery(TExperimentDispatch.class)
+ .in(TExperimentDispatch::getProposalId, projectIds));
+ if(!CollectionUtils.isEmpty(experimentDispatches)){
+ experimentDispatches.forEach(experimentDispatch -> {
+ experimentDispatch.setStatus(experimentDispatch.getOldStatus());
+ });
+ experimentDispatchService.updateBatchById(experimentDispatches);
+
+ // 封存检验方法
+ List<String> dispatchIds = experimentDispatches.stream().map(TExperimentDispatch::getId).collect(Collectors.toList());
+ List<TTestMethodConfirmSheet> testMethodConfirmSheets = testMethodConfirmSheetService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheet.class)
+ .in(TTestMethodConfirmSheet::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(testMethodConfirmSheets)){
+ testMethodConfirmSheets.forEach(testMethodConfirmSheet -> {
+ testMethodConfirmSheet.setAuditStatus(testMethodConfirmSheet.getAuditStatus());
+ });
+ testMethodConfirmSheetService.updateBatchById(testMethodConfirmSheets);
+ }
+
+ // 封存试验方案
+ List<TExperimentScheme> experimentSchemes = experimentSchemeService.list(Wrappers.lambdaQuery(TExperimentScheme.class)
+ .in(TExperimentScheme::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(experimentSchemes)){
+ experimentSchemes.forEach(experimentScheme -> {
+ experimentScheme.setStatus(experimentScheme.getOldStatus());
+ });
+ experimentSchemeService.updateBatchById(experimentSchemes);
+ }
+
+ // 封存取样记录
+ List<TSamplingRecord> samplingRecords = samplingRecordService.list(Wrappers.lambdaQuery(TSamplingRecord.class)
+ .in(TSamplingRecord::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(samplingRecords)){
+ samplingRecords.forEach(samplingRecord -> {
+ samplingRecord.setStatus(samplingRecord.getOldStatus());
+ });
+ samplingRecordService.updateBatchById(samplingRecords);
+ }
+
+ // 封存结果汇报
+ List<TExperimentResultReport> experimentResultReports = experimentResultReportService.list(Wrappers.lambdaQuery(TExperimentResultReport.class)
+ .in(TExperimentResultReport::getDispatchId, dispatchIds));
+ if(!CollectionUtils.isEmpty(experimentResultReports)){
+ experimentResultReports.forEach(experimentResultReport -> {
+ experimentResultReport.setStatus(experimentResultReport.getOldStatus());
+ });
+ experimentResultReportService.updateBatchById(experimentResultReports);
+ }
+ }
+ }
+ }
+
return R.ok();
}
+ /**
+ * 查看项目组详情
+ */
+ @ApiOperation(value = "查询当前用户项目组信息")
+ @GetMapping(value = "/open/t-project-team/getDetailByUserId")
+ public R<TProjectTeamVO> getDetailByUserId() {
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .eq(TProjectTeamStaff::getRoleType, roleType)
+ .last("LIMIT 1"));
+ if(Objects.isNull(projectTeamStaff)){
+ return R.fail("当前用户未分配项目组,无法查看项目组信息");
+ }
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ TProjectTeamVO projectTeamVO = new TProjectTeamVO();
+ BeanUtils.copyProperties(projectTeam, projectTeamVO);
+ // 查询项目组人员
+ List<TProjectTeamStaff> list = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId()));
+ // 查询所有人员
+ List<SysUser> sysUsers = sysUserService.selectList();
+ for (TProjectTeamStaff tProjectTeamStaff : list) {
+ sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(tProjectTeamStaff.getUserId())).forEach(sysUser -> {
+ tProjectTeamStaff.setNickName(sysUser.getNickName());
+ tProjectTeamStaff.setAvatar(sysUser.getAvatar());
+ });
+ }
+ projectTeamVO.setStaffs(list);
+ projectTeamVO.setStaffName(list.stream().map(TProjectTeamStaff::getNickName).collect(Collectors.joining(",")));
+ return R.ok(projectTeamVO);
+ }
+
}
--
Gitblit v1.7.1