update
This commit is contained in:
@@ -88,10 +88,15 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
|
|||||||
ExperimentReview experimentReview = getOne(
|
ExperimentReview experimentReview = getOne(
|
||||||
new LambdaQueryWrapper<ExperimentReview>().eq(ExperimentReview::getExperimentId, experimentId)
|
new LambdaQueryWrapper<ExperimentReview>().eq(ExperimentReview::getExperimentId, experimentId)
|
||||||
.eq(ExperimentReview::getSampleId, sampleId), false);
|
.eq(ExperimentReview::getSampleId, sampleId), false);
|
||||||
|
if (Objects.isNull(experimentReview)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
List<ExperimentReviewDetail> detailList = experimentReviewDetailService.getBySample(experimentId, sampleId);
|
List<ExperimentReviewDetail> detailList = experimentReviewDetailService.getBySample(experimentId, sampleId);
|
||||||
|
if (CollUtil.isNotEmpty(detailList)) {
|
||||||
List<ExperimentReviewRule> matchedRuleList = detailList.stream().map(v -> experimentReviewRuleService.getById(v.getRuleId()))
|
List<ExperimentReviewRule> matchedRuleList = detailList.stream().map(v -> experimentReviewRuleService.getById(v.getRuleId()))
|
||||||
.filter(v -> v != null).collect(Collectors.toList());
|
.filter(v -> v != null).collect(Collectors.toList());
|
||||||
experimentReview.setMatchedRuleList(matchedRuleList);
|
experimentReview.setMatchedRuleList(matchedRuleList);
|
||||||
|
}
|
||||||
Experiment experiment = experimentService.getById(experimentId);
|
Experiment experiment = experimentService.getById(experimentId);
|
||||||
ExperimentSampleInfo sampleInfo = experimentSampleInfoService.getById(sampleId);
|
ExperimentSampleInfo sampleInfo = experimentSampleInfoService.getById(sampleId);
|
||||||
experimentReview.setExperimentName(experiment.getName());
|
experimentReview.setExperimentName(experiment.getName());
|
||||||
|
|||||||
Reference in New Issue
Block a user