physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ESCC22500

Browse Source
This commit is contained in:
ls
2025-06-30 21:55:04 +08:00
parent a9383a6e56
commit 6320f07ac2
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java
View File

@@ -84,12 +84,15 @@ public class ExperimentReviewController extends JeecgController<ExperimentReview
@Operation(summary = "试验评定结果-通过试验id查询") @Operation(summary = "试验评定结果-通过试验id查询")
@GetMapping(value = "/queryByExperimentId") @GetMapping(value = "/queryByExperimentId")
public Result<Experiment> queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentId) { public Result<Experiment> queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentId,
@RequestParam(name = "sampleId", required = true) String sampleId) {
Experiment experiment = experimentService.getById(experimentId); Experiment experiment = experimentService.getById(experimentId);
if (null == experiment) { if (null == experiment) {
return Result.error("未找到试验数据"); return Result.error("未找到试验数据");
} }
List<ExperimentReviewDTO> experimentReviewList = experimentReviewService.getByExperimentId(experimentId); List<ExperimentReviewDTO> experimentReviewList = experimentReviewService.getByExperimentId(experimentId);
ExperimentReview experimentReview = experimentReviewService.getBySampleId(experimentId, sampleId);
experiment.setExperimentReview(experimentReview);
experiment.setExperimentReviewList(experimentReviewList); experiment.setExperimentReviewList(experimentReviewList);
return Result.OK(experiment); return Result.OK(experiment);

2
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java
View File

@@ -253,5 +253,7 @@ public class Experiment implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private List<ExperimentReviewDTO> ExperimentReviewList; private List<ExperimentReviewDTO> ExperimentReviewList;
@TableField(exist = false)
private ExperimentReview ExperimentReview;
} }

14
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java
View File

@@ -85,8 +85,18 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
@Override @Override
public ExperimentReview getBySampleId(String experimentId, String sampleId) { public ExperimentReview getBySampleId(String experimentId, String sampleId) {
return getOne(new LambdaQueryWrapper<ExperimentReview>().eq(ExperimentReview::getExperimentId, experimentId) ExperimentReview experimentReview = getOne(
.eq(ExperimentReview::getSampleId, sampleId), false); new LambdaQueryWrapper<ExperimentReview>().eq(ExperimentReview::getExperimentId, experimentId)
.eq(ExperimentReview::getSampleId, sampleId), false);
List<ExperimentReviewDetail> detailList = experimentReviewDetailService.getBySample(experimentId, sampleId);
List<ExperimentReviewRule> matchedRuleList = detailList.stream().map(v -> experimentReviewRuleService.getById(v.getRuleId()))
.filter(v -> v != null).collect(Collectors.toList());
experimentReview.setMatchedRuleList(matchedRuleList);
Experiment experiment = experimentService.getById(experimentId);
ExperimentSampleInfo sampleInfo = experimentSampleInfoService.getById(sampleId);
experimentReview.setExperimentName(experiment.getName());
experimentReview.setSampleName(sampleInfo.getSampleName());
return experimentReview;
} }
@Override @Override