diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java index c9352b4..eb00aa4 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java @@ -270,6 +270,7 @@ public class ExperimentReportController extends JeecgController v.getMemo()).orElse("")); + params.put("校对驳回意见",Optional.ofNullable(latestReport).map(ExperimentReport::getProofreaderMemo).orElse("")); + params.put("审核驳回意见", Optional.ofNullable(latestReport).map(ExperimentReport::getAuditorMemo).orElse("")); + params.put("批准驳回意见", Optional.ofNullable(latestReport).map(ExperimentReport::getConfirmerMemo).orElse("")); return new HashMap<>(); } diff --git a/templates/sybg.docx b/templates/sybg.docx index c80462f..9c01fc3 100644 Binary files a/templates/sybg.docx and b/templates/sybg.docx differ