From d2138aa6a2dce54a85228471d2f6f367c5e8795c Mon Sep 17 00:00:00 2001 From: ls Date: Fri, 25 Jul 2025 16:39:22 +0800 Subject: [PATCH] review --- .../modules/database/service/executor/ESCC225003Executor.java | 2 +- .../modules/database/service/executor/ESCC2290009Executor.java | 2 +- .../modules/database/service/executor/GJB548C12Executor.java | 3 ++- .../modules/database/service/executor/GJB548C15Executor.java | 2 +- .../modules/database/service/executor/GJB548C16Executor.java | 2 +- .../modules/database/service/executor/QJ1000412Executor.java | 2 +- .../modules/database/service/executor/QJ1000415Executor.java | 2 +- .../modules/database/service/executor/QJ1000416Executor.java | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225003Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225003Executor.java index 80c00b7..ef36242 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225003Executor.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225003Executor.java @@ -51,7 +51,7 @@ public class ESCC225003Executor extends BaseExecutor implements IExperimentRevie List experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId()); for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) { String annealTemperature = experimentAnnealProcess.getAnnealTemperature(); - Integer temp = Integer.valueOf(annealTemperature); + Double temp = Double.valueOf(annealTemperature); if (temp < 10) { condition1 = true; break; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290009Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290009Executor.java index 1985a91..484cfba 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290009Executor.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290009Executor.java @@ -45,7 +45,7 @@ public class ESCC2290009Executor extends BaseExecutor implements IExperimentRevi break; } } - if (!condition3) { + if (condition3) { return ExperimentReviewResultEnum.NOT_PASS; } return ExperimentReviewResultEnum.ITEM_PASS; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C12Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C12Executor.java index 58feed1..4f6f4d1 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C12Executor.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C12Executor.java @@ -54,7 +54,7 @@ public class GJB548C12Executor extends BaseExecutor implements IExperimentReview List radiationProcessList = experimentRadiationProcessService.getByExperimentId(experiment.getId()); for (ExperimentRadiationProcess experimentRadiationProcess : radiationProcessList) { String environmentalTemperature = experimentRadiationProcess.getEnvironmentalTemperature(); - Integer temp = Integer.valueOf(environmentalTemperature); + Double temp = Double.valueOf(environmentalTemperature); if (temp < 18) { condition1 = true; break; @@ -72,4 +72,5 @@ public class GJB548C12Executor extends BaseExecutor implements IExperimentReview } return ExperimentReviewResultEnum.ITEM_PASS; } + } \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C15Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C15Executor.java index 2b7f038..749f2b1 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C15Executor.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C15Executor.java @@ -74,7 +74,7 @@ public class GJB548C15Executor extends BaseExecutor implements IExperimentReview break; } } - if (condition1 && condition2 && condition3) { + if (condition1 && condition2 && !condition3) { return ExperimentReviewResultEnum.FINAL_PASS; } return ExperimentReviewResultEnum.ITEM_PASS; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C16Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C16Executor.java index 6c41274..62dfdb8 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C16Executor.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C16Executor.java @@ -45,7 +45,7 @@ public class GJB548C16Executor extends BaseExecutor implements IExperimentReview break; } } - if (!condition3) { + if (condition3) { return ExperimentReviewResultEnum.NOT_PASS; } return ExperimentReviewResultEnum.ITEM_PASS; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000412Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000412Executor.java index 9825ee1..88af124 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000412Executor.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000412Executor.java @@ -54,7 +54,7 @@ public class QJ1000412Executor extends BaseExecutor implements IExperimentReview List radiationProcessList = experimentRadiationProcessService.getByExperimentId(experiment.getId()); for (ExperimentRadiationProcess experimentRadiationProcess : radiationProcessList) { String environmentalTemperature = experimentRadiationProcess.getEnvironmentalTemperature(); - Integer temp = Integer.valueOf(environmentalTemperature); + Double temp = Double.valueOf(environmentalTemperature); if (temp < 15) { condition1 = true; break; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000415Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000415Executor.java index f70ce96..bd19212 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000415Executor.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000415Executor.java @@ -74,7 +74,7 @@ public class QJ1000415Executor extends BaseExecutor implements IExperimentReview break; } } - if (condition1 && condition2 && condition3) { + if (condition1 && condition2 && !condition3) { return ExperimentReviewResultEnum.FINAL_PASS; } return ExperimentReviewResultEnum.ITEM_PASS; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000416Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000416Executor.java index e8a268d..638ab7f 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000416Executor.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000416Executor.java @@ -45,7 +45,7 @@ public class QJ1000416Executor extends BaseExecutor implements IExperimentReview break; } } - if (!condition3) { + if (condition3) { return ExperimentReviewResultEnum.NOT_PASS; } return ExperimentReviewResultEnum.ITEM_PASS;