diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java index a976445..0c743f6 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReviewController.java @@ -84,12 +84,15 @@ public class ExperimentReviewController extends JeecgController queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentId) { + public Result queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentId, + @RequestParam(name = "sampleId", required = true) String sampleId) { Experiment experiment = experimentService.getById(experimentId); if (null == experiment) { return Result.error("未找到试验数据"); } List experimentReviewList = experimentReviewService.getByExperimentId(experimentId); + ExperimentReview experimentReview = experimentReviewService.getBySampleId(experimentId, sampleId); + experiment.setExperimentReview(experimentReview); experiment.setExperimentReviewList(experimentReviewList); return Result.OK(experiment); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java index b84c485..49e3915 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java @@ -253,5 +253,7 @@ public class Experiment implements Serializable { @TableField(exist = false) private List ExperimentReviewList; + @TableField(exist = false) + private ExperimentReview ExperimentReview; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java index 7c7c3f7..35c5541 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java @@ -85,8 +85,18 @@ public class ExperimentReviewServiceImpl extends ServiceImpl().eq(ExperimentReview::getExperimentId, experimentId) - .eq(ExperimentReview::getSampleId, sampleId), false); + ExperimentReview experimentReview = getOne( + new LambdaQueryWrapper().eq(ExperimentReview::getExperimentId, experimentId) + .eq(ExperimentReview::getSampleId, sampleId), false); + List detailList = experimentReviewDetailService.getBySample(experimentId, sampleId); + List 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