update
This commit is contained in:
@@ -69,7 +69,7 @@ public class GJB548C1Executor extends BaseExecutor implements IExperimentReviewR
|
|||||||
point -> StringUtils.isNotBlank(point)).filter(str -> str.matches("-?\\d+(\\.\\d+)?")).mapToDouble(Double::parseDouble)
|
point -> StringUtils.isNotBlank(point)).filter(str -> str.matches("-?\\d+(\\.\\d+)?")).mapToDouble(Double::parseDouble)
|
||||||
.min().orElse(0d);
|
.min().orElse(0d);
|
||||||
if (sampleInfo.getSampleName().contains("双极") && sampleInfo.getSampleType().equals("模拟集成电路") && NumberUtil.compare(
|
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;
|
return ExperimentReviewResultEnum.HIGH;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ public class GJB548C2Executor extends BaseExecutor implements IExperimentReview
|
|||||||
Double minRate = detailDTOList.stream().map(obj -> obj.getActualMeasurementRate()).filter(
|
Double minRate = detailDTOList.stream().map(obj -> obj.getActualMeasurementRate()).filter(
|
||||||
point -> StringUtils.isNotBlank(point)).filter(str -> str.matches("-?\\d+(\\.\\d+)?")).mapToDouble(Double::parseDouble)
|
point -> StringUtils.isNotBlank(point)).filter(str -> str.matches("-?\\d+(\\.\\d+)?")).mapToDouble(Double::parseDouble)
|
||||||
.max().orElse(0d);
|
.max().orElse(0d);
|
||||||
if (!sampleInfo.getSampleName().contains("双极") && NumberUtil.compare(
|
if (!sampleInfo.getSampleType().equals("模拟集成电路") &&!sampleInfo.getSampleName().contains("双极") && NumberUtil.compare(
|
||||||
minRate, 50d) < 0) {
|
minRate, 50d) < 0) {
|
||||||
return ExperimentReviewResultEnum.LOW;
|
return ExperimentReviewResultEnum.LOW;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user