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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
dengchun
2025-08-05 00:08:19 +08:00
parent 0e2035bb18 5a413a7444
commit ae7439db71
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100041Executor.java
View File

@@ -69,7 +69,7 @@ public class QJ100041Executor 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;
} }
} }

2
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ100042Executor.java
View File

@@ -68,7 +68,7 @@ public class QJ100042Executor 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;
} }