review
This commit is contained in:
@@ -51,7 +51,7 @@ public class ESCC225003Executor extends BaseExecutor implements IExperimentRevie
|
|||||||
List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId());
|
List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId());
|
||||||
for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) {
|
for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) {
|
||||||
String annealTemperature = experimentAnnealProcess.getAnnealTemperature();
|
String annealTemperature = experimentAnnealProcess.getAnnealTemperature();
|
||||||
Integer temp = Integer.valueOf(annealTemperature);
|
Double temp = Double.valueOf(annealTemperature);
|
||||||
if (temp < 10) {
|
if (temp < 10) {
|
||||||
condition1 = true;
|
condition1 = true;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ public class ESCC2290009Executor extends BaseExecutor implements IExperimentRevi
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!condition3) {
|
if (condition3) {
|
||||||
return ExperimentReviewResultEnum.NOT_PASS;
|
return ExperimentReviewResultEnum.NOT_PASS;
|
||||||
}
|
}
|
||||||
return ExperimentReviewResultEnum.ITEM_PASS;
|
return ExperimentReviewResultEnum.ITEM_PASS;
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ public class GJB548C12Executor extends BaseExecutor implements IExperimentReview
|
|||||||
List<ExperimentRadiationProcess> radiationProcessList = experimentRadiationProcessService.getByExperimentId(experiment.getId());
|
List<ExperimentRadiationProcess> radiationProcessList = experimentRadiationProcessService.getByExperimentId(experiment.getId());
|
||||||
for (ExperimentRadiationProcess experimentRadiationProcess : radiationProcessList) {
|
for (ExperimentRadiationProcess experimentRadiationProcess : radiationProcessList) {
|
||||||
String environmentalTemperature = experimentRadiationProcess.getEnvironmentalTemperature();
|
String environmentalTemperature = experimentRadiationProcess.getEnvironmentalTemperature();
|
||||||
Integer temp = Integer.valueOf(environmentalTemperature);
|
Double temp = Double.valueOf(environmentalTemperature);
|
||||||
if (temp < 18) {
|
if (temp < 18) {
|
||||||
condition1 = true;
|
condition1 = true;
|
||||||
break;
|
break;
|
||||||
@@ -72,4 +72,5 @@ public class GJB548C12Executor extends BaseExecutor implements IExperimentReview
|
|||||||
}
|
}
|
||||||
return ExperimentReviewResultEnum.ITEM_PASS;
|
return ExperimentReviewResultEnum.ITEM_PASS;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -74,7 +74,7 @@ public class GJB548C15Executor extends BaseExecutor implements IExperimentReview
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (condition1 && condition2 && condition3) {
|
if (condition1 && condition2 && !condition3) {
|
||||||
return ExperimentReviewResultEnum.FINAL_PASS;
|
return ExperimentReviewResultEnum.FINAL_PASS;
|
||||||
}
|
}
|
||||||
return ExperimentReviewResultEnum.ITEM_PASS;
|
return ExperimentReviewResultEnum.ITEM_PASS;
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ public class GJB548C16Executor extends BaseExecutor implements IExperimentReview
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!condition3) {
|
if (condition3) {
|
||||||
return ExperimentReviewResultEnum.NOT_PASS;
|
return ExperimentReviewResultEnum.NOT_PASS;
|
||||||
}
|
}
|
||||||
return ExperimentReviewResultEnum.ITEM_PASS;
|
return ExperimentReviewResultEnum.ITEM_PASS;
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ public class QJ1000412Executor extends BaseExecutor implements IExperimentReview
|
|||||||
List<ExperimentRadiationProcess> radiationProcessList = experimentRadiationProcessService.getByExperimentId(experiment.getId());
|
List<ExperimentRadiationProcess> radiationProcessList = experimentRadiationProcessService.getByExperimentId(experiment.getId());
|
||||||
for (ExperimentRadiationProcess experimentRadiationProcess : radiationProcessList) {
|
for (ExperimentRadiationProcess experimentRadiationProcess : radiationProcessList) {
|
||||||
String environmentalTemperature = experimentRadiationProcess.getEnvironmentalTemperature();
|
String environmentalTemperature = experimentRadiationProcess.getEnvironmentalTemperature();
|
||||||
Integer temp = Integer.valueOf(environmentalTemperature);
|
Double temp = Double.valueOf(environmentalTemperature);
|
||||||
if (temp < 15) {
|
if (temp < 15) {
|
||||||
condition1 = true;
|
condition1 = true;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ public class QJ1000415Executor extends BaseExecutor implements IExperimentReview
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (condition1 && condition2 && condition3) {
|
if (condition1 && condition2 && !condition3) {
|
||||||
return ExperimentReviewResultEnum.FINAL_PASS;
|
return ExperimentReviewResultEnum.FINAL_PASS;
|
||||||
}
|
}
|
||||||
return ExperimentReviewResultEnum.ITEM_PASS;
|
return ExperimentReviewResultEnum.ITEM_PASS;
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ public class QJ1000416Executor extends BaseExecutor implements IExperimentReview
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!condition3) {
|
if (condition3) {
|
||||||
return ExperimentReviewResultEnum.NOT_PASS;
|
return ExperimentReviewResultEnum.NOT_PASS;
|
||||||
}
|
}
|
||||||
return ExperimentReviewResultEnum.ITEM_PASS;
|
return ExperimentReviewResultEnum.ITEM_PASS;
|
||||||
|
|||||||
Reference in New Issue
Block a user