From 06c35f82b4e7ef63b978fb298b41a5ac0152f5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com>
Date: Tue, 25 Jul 2023 09:59:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ReportController.java              | 15 ++++++++++++---
 .../trading_trading/dto/GradeWeightDetailBO.java  |  3 +++
 .../forex/trading_trading/entity/Report.java      |  4 ++++
 .../trading_trading/service/ReportService.java    | 11 +++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/sztzjy/forex/trading_trading/controller/ReportController.java b/src/main/java/com/sztzjy/forex/trading_trading/controller/ReportController.java
index d4c37d9..f5c1976 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/controller/ReportController.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/controller/ReportController.java
@@ -2,6 +2,7 @@ package com.sztzjy.forex.trading_trading.controller;
 
 import com.sztzjy.forex.trading_trading.annotation.Permission;
 import com.sztzjy.forex.trading_trading.annotation.aspect.PermissionType;
+import com.sztzjy.forex.trading_trading.entity.Report;
 import com.sztzjy.forex.trading_trading.entity.ReportWithBLOBs;
 import com.sztzjy.forex.trading_trading.service.ReportService;
 import com.sztzjy.forex.trading_trading.util.ResultEntity;
@@ -23,11 +24,11 @@ public class ReportController {
     private ReportService reportService;
 
     @PostMapping("/uploadReport")
-    public ResultEntity<String> uploadReport(@RequestParam("file") MultipartFile  file,
+    public ResultEntity<String> uploadReport(@RequestParam("file") MultipartFile file,
                                              @RequestParam String memberId,
                                              @RequestParam String fileName,
                                              @RequestParam String tariningId) throws IOException {
-       return new ResultEntity<>(reportService.uploadReport(file.getInputStream(),fileName,memberId,tariningId));
+        return new ResultEntity<>(reportService.uploadReport(file.getInputStream(), fileName, memberId, tariningId));
     }
 
     @PostMapping("/submitReport")
@@ -48,6 +49,14 @@ public class ReportController {
     @ApiOperation("教师端--实训报告下载")
     @GetMapping("download")
     public void download(@RequestParam String id, HttpServletResponse response) {
-        reportService.download(id,response);
+        reportService.download(id, response);
+    }
+
+
+    @ApiOperation("教师端--获取学生上传的报告")
+    @GetMapping("getReportByMemberId")
+    public ResultEntity<Report> getReportByMemberId(@RequestParam String memberId
+    ) {
+        return new ResultEntity<>(reportService.findByMemberId(memberId));
     }
 }
diff --git a/src/main/java/com/sztzjy/forex/trading_trading/dto/GradeWeightDetailBO.java b/src/main/java/com/sztzjy/forex/trading_trading/dto/GradeWeightDetailBO.java
index 0321bde..4ca4569 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/dto/GradeWeightDetailBO.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/dto/GradeWeightDetailBO.java
@@ -35,4 +35,7 @@ public class GradeWeightDetailBO {
         this.score = score;
         this.level = level;
     }
+
+    public GradeWeightDetailBO() {
+    }
 }
diff --git a/src/main/java/com/sztzjy/forex/trading_trading/entity/Report.java b/src/main/java/com/sztzjy/forex/trading_trading/entity/Report.java
index 4175338..1186a08 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/entity/Report.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/entity/Report.java
@@ -1,6 +1,7 @@
 package com.sztzjy.forex.trading_trading.entity;
 
 import cn.hutool.core.util.IdUtil;
+import io.swagger.annotations.ApiModelProperty;
 
 import javax.persistence.Column;
 
@@ -30,6 +31,7 @@ public class Report {
      *
      * @mbg.generated Thu Jul 20 13:28:37 CST 2023
      */
+
     private String memberId;
 
     /**
@@ -39,6 +41,7 @@ public class Report {
      *
      * @mbg.generated Thu Jul 20 13:28:37 CST 2023
      */
+    @ApiModelProperty("实验报告文件路径")
     private String filePath;
 
     /**
@@ -48,6 +51,7 @@ public class Report {
      *
      * @mbg.generated Thu Jul 20 13:28:37 CST 2023
      */
+    @ApiModelProperty("实验报告文件名")
     private String fileName;
 
     /**
diff --git a/src/main/java/com/sztzjy/forex/trading_trading/service/ReportService.java b/src/main/java/com/sztzjy/forex/trading_trading/service/ReportService.java
index 31bfe70..75554aa 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/service/ReportService.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/service/ReportService.java
@@ -146,4 +146,15 @@ public class ReportService {
         Assert.isTrue(report!=null&&report.getFilePath()!=null,"报告不存在");
         fileUtil.download(response,report.getFileName(),report.getFilePath());
     }
+
+    public Report findByMemberId(String memberId){
+        ReportExample reportExample = new ReportExample();
+        ReportExample.Criteria criteria = reportExample.createCriteria();
+        criteria.andMemberIdEqualTo(memberId);
+        List<Report> reports = reportsMapper.selectByExample(reportExample);
+        if(reports!=null&&reports.size()>0){
+            return reports.get(0);
+        }
+        return null;
+    }
 }