From 9f480a6addb804f667041224b5d527584a690c9b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 09 十二月 2025 15:44:36 +0800
Subject: [PATCH] 1.0版本验收时，遗留的新增项，实验结果汇报增加原始检验记录
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java
index f2fe0f1..43bd618 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java
@@ -13,11 +13,10 @@
import com.ruoyi.system.dto.TExperimentResultReportRejectDTO;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.OriginalPageListQuery;
import com.ruoyi.system.query.TExperimentResultReportQuery;
import com.ruoyi.system.service.*;
-import com.ruoyi.system.vo.TExperimentDispatchVO;
-import com.ruoyi.system.vo.TExperimentResultReportVO;
-import com.ruoyi.system.vo.TExperimentSchemeVO;
+import com.ruoyi.system.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -56,8 +55,11 @@
private final TExperimentDispatchService experimentDispatchService;
private final TProjectProposalService projectProposalService;
private final TNoticeService noticeService;
+ private final TTestMethodConfirmSheetService testMethodConfirmSheetService;
+ private final TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService;
+ private final TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService;
@Autowired
- public TExperimentResultReportController(TExperimentResultReportService experimentResultReportService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TResultWorkEvaluateService resultWorkEvaluateService, TExperimentSchemeService experimentSchemeService, TInspectionReportService inspectionReportService, TProjectTeamStaffService projectTeamStaffService, TProjectTeamService projectTeamService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TNoticeService noticeService) {
+ public TExperimentResultReportController(TExperimentResultReportService experimentResultReportService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TResultWorkEvaluateService resultWorkEvaluateService, TExperimentSchemeService experimentSchemeService, TInspectionReportService inspectionReportService, TProjectTeamStaffService projectTeamStaffService, TProjectTeamService projectTeamService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TNoticeService noticeService, TTestMethodConfirmSheetService testMethodConfirmSheetService, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService) {
this.experimentResultReportService = experimentResultReportService;
this.tokenService = tokenService;
this.sysUserService = sysUserService;
@@ -71,6 +73,9 @@
this.experimentDispatchService = experimentDispatchService;
this.projectProposalService = projectProposalService;
this.noticeService = noticeService;
+ this.testMethodConfirmSheetService = testMethodConfirmSheetService;
+ this.testMethodConfirmSheetTermService = testMethodConfirmSheetTermService;
+ this.testMethodConfirmSheetOriginalService = testMethodConfirmSheetOriginalService;
}
/**
@@ -259,7 +264,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:experimentResultReport:edit')")
@Log(title = "实验结果汇报信息-评定工艺工程师实验-驳回实验结果汇报", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "评定工艺工程师实验-驳回实验结果汇报",response = TResultWorkEvaluate.class)
+ @ApiOperation(value = "评定工艺工程师实验-驳回实验结果汇报",response = TExperimentResultReportRejectDTO.class)
@PostMapping(value = "/api/t-experiment-result-report/rejectResult")
public R<Boolean> rejectResult(@RequestBody String param) {
TExperimentResultReportRejectDTO experimentResultReportRejectDTO = JSON.parseObject(param,TExperimentResultReportRejectDTO.class);
@@ -396,6 +401,18 @@
}
/**
+ * 通过实验调度id获取原始检验记录列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:experimentResultReport:detail')")
+ @ApiOperation(value = "通过实验调度id获取原始检验记录列表",response = OriginalPageListQuery.class)
+ @PostMapping(value = "/api/t-experiment-result-report/getOriginalPageListByDispatchId")
+ public R<PageInfo<TTestMethodConfirmSheetOriginalVO>> getOriginalPageListByDispatchId(@RequestBody String param) {
+ OriginalPageListQuery query = JSON.parseObject(param,OriginalPageListQuery.class);
+ PageInfo<TTestMethodConfirmSheetOriginalVO> pageInfo = testMethodConfirmSheetOriginalService.getOriginalPageListByDispatchId(query);
+ return R.ok(pageInfo);
+ }
+
+ /**
* 提交接口
*/
//@PreAuthorize("@ss.hasPermi('system:experimentResultReport:detail')")
--
Gitblit v1.7.1