From 895dbb3aab6e3a86c53eb6c9aedaab6656e3bd41 Mon Sep 17 00:00:00 2001 From: ls Date: Mon, 4 Aug 2025 23:47:00 +0800 Subject: [PATCH] review --- .../modules/database/service/executor/QJ100041Executor.java | 2 +- .../modules/database/service/executor/QJ100042Executor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100041Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100041Executor.java index 33fff71..5c4c31c 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100041Executor.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100041Executor.java @@ -69,7 +69,7 @@ public class QJ100041Executor extends BaseExecutor implements IExperimentReviewR point -> StringUtils.isNotBlank(point)).filter(str -> str.matches("-?\\d+(\\.\\d+)?")).mapToDouble(Double::parseDouble) .min().orElse(0d); if (sampleInfo.getSampleName().contains("双极") && sampleInfo.getSampleType().equals("模拟集成电路") && NumberUtil.compare( - minRate, 0.01d) > 0 && StringUtils.contains(radiationProcess.getComment(), "加速试验")) { + minRate, 0.01d) > 0 && !StringUtils.contains(radiationProcess.getComment(), "加速试验")) { return ExperimentReviewResultEnum.HIGH; } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100042Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100042Executor.java index 2b573c0..1b6a886 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100042Executor.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100042Executor.java @@ -68,7 +68,7 @@ public class QJ100042Executor extends BaseExecutor implements IExperimentReview Double minRate = detailDTOList.stream().map(obj -> obj.getActualMeasurementRate()).filter( point -> StringUtils.isNotBlank(point)).filter(str -> str.matches("-?\\d+(\\.\\d+)?")).mapToDouble(Double::parseDouble) .max().orElse(0d); - if (!sampleInfo.getSampleName().contains("双极") && NumberUtil.compare( + if (!sampleInfo.getSampleType().equals("模拟集成电路") &&!sampleInfo.getSampleName().contains("双极") && NumberUtil.compare( minRate, 50d) < 0) { return ExperimentReviewResultEnum.LOW; }