review

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java

@@ -92,7 +92,12 @@ public class ExperimentReview implements Serializable {
     @Excel(name = "是否需要退火", width = 15)
     @Schema(description = "是否需要退火", allowableValues = {"Y", "N"})
     private String needAnneal;
-
+    /**
+     * 是否需要老练
+     */
+    @Excel(name = "是否进行了针对性的退火表征试验", width = 15)
+    @Schema(description = "是否进行了针对性的退火表征试验", allowableValues = {"Y", "N"})
+    private String targetedAnneal;
     /**
      * 是否需要辐照
      */

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C14Executor.java

@@ -61,7 +61,7 @@ public class GJB548C14Executor extends BaseExecutor implements IExperimentReview
                 break;
             }
         }
-        if (StringUtils.contains(experimentReview.getNeedAnneal(), "N")) {
+        if (StringUtils.contains(experimentReview.getTargetedAnneal(), "N")) {
             condition2 = true;
         }
 

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java

@@ -51,6 +51,7 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
         result.setNeedAnneal(experimentReview.getNeedAnneal());
         result.setNeedBurnin(experimentReview.getNeedBurnin());
         result.setNeedRadiation(experimentReview.getNeedRadiation());
+        result.setTargetedAnneal(experimentReview.getTargetedAnneal());
         for (int i = 0; i < ruleList.size(); i++) {
             ExperimentReviewRule rule = ruleList.get(i);
             String executeResult = executorHolder.execute(rule.getProcessType() + rule.getPriority(), experiment, sampleInfo,