From bd953391a74b86db829df43992c7cf3c5207634b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 六月 2025 18:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java | 130 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 124 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 0688c45..65b1130 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
@@ -12,17 +12,15 @@
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;
@@ -46,12 +44,38 @@
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, TokenService tokenService) {
+ 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;
}
/**
@@ -198,6 +222,100 @@
TProjectTeam projectTeam = projectTeamService.getById(dto.getId());
projectTeam.setStatus(dto.getStatus());
projectTeamService.updateById(projectTeam);
+
+ // 封存项目课题方案
+ List<TProjectProposal> projectProposals = projectProposalService.list(Wrappers.lambdaQuery(TProjectProposal.class)
+ .eq(TProjectProposal::getTeamId, dto.getId()));
+ if(!CollectionUtils.isEmpty(projectProposals)){
+ for (TProjectProposal projectProposal : projectProposals) {
+ 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.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.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.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.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.setStatus(4);
+ });
+ experimentResultReportService.updateBatchById(experimentResultReports);
+ }
+
+ }
+ }
+
+ // 封存检测项
+// List<TQaTestItem> qaTestItems = qaTestItemService.list(Wrappers.lambdaQuery(TQaTestItem.class)
+// .eq(TQaTestItem::getTeamId, dto.getId()));
+// if(!CollectionUtils.isEmpty(qaTestItems)){
+// qaTestItems.forEach(qaTestItem -> {
+// qaTestItem.setStatus(4);
+// });
+// qaTestItemService.updateBatchById(qaTestItems);
+// }
+
+ // 封存中试
+// List<TQaProduceReport> qaProduceReports = qaProduceReportService.list(Wrappers.lambdaQuery(TQaProduceReport.class)
+// .eq(TQaProduceReport::getTeamId, dto.getId()));
+// if(!CollectionUtils.isEmpty(qaProduceReports)){
+// qaProduceReports.forEach(qaProduceReport -> {
+// qaProduceReport.setStatus(4);
+// });
+// qaProduceReportService.updateBatchById(qaProduceReports);
+// }
+
+ // 封存可行等报告
+// List<TFeasibilityStudyReport> feasibilityStudyReports = feasibilityStudyReportService.list(Wrappers.lambdaQuery(TFeasibilityStudyReport.class)
+// .eq(TFeasibilityStudyReport::getTeamId, dto.getId()));
+// if(!CollectionUtils.isEmpty(feasibilityStudyReports)){
+// feasibilityStudyReports.forEach(feasibilityStudyReport -> {
+// feasibilityStudyReport.setStatus(4);
+// });
+// feasibilityStudyReportService.updateBatchById(feasibilityStudyReports);
+// }
+
+
return R.ok();
}
--
Gitblit v1.7.1