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

review

Browse Source
This commit is contained in:
ls
2025-07-25 17:01:25 +08:00
parent d2138aa6a2
commit 5970c6c2d0
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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