From 622ccb3cedb5db0dd1080b2f0105ca1d9dfac5ee Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Wed, 30 Aug 2023 08:57:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E6=98=BE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/TrainingScoreController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java index 3f9abf4..3e1766b 100644 --- a/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java +++ b/ruoyi-biemo/src/main/java/com/ruoyi/biemo/business/controller/TrainingScoreController.java @@ -141,11 +141,18 @@ public class TrainingScoreController { List sysTrainingScores = trainingScoreMapper.selectByExampleWithBLOBs(trainingScoreExample); if (!sysTrainingScores.isEmpty()) { SysTrainingScoreWithBLOBs sysTrainingScore = sysTrainingScores.get(0); - return sysTrainingScore.getReportContent(); + String reportSaveContent = sysTrainingScore.getReportSaveContent(); + String reportContent = sysTrainingScore.getReportContent(); + + if (reportSaveContent != null && !reportSaveContent.isEmpty()) { + return reportSaveContent; + } else if (reportContent != null && !reportContent.isEmpty()) { + return reportContent; + } } + return null; } - // 老师端文件下载 @GetMapping("/downloadReport") public AjaxResult downloadReport(@RequestParam Long id, HttpServletResponse response) {