增加获取用户做过的试卷的接口

src/main/java/edu/math/diagnosis/controller/PaperCommitController.java

@@ -1,6 +1,5 @@
 package edu.math.diagnosis.controller;
 
-import edu.math.diagnosis.entity.Paper;
 import edu.math.diagnosis.entity.PaperCommit;
 import edu.math.diagnosis.model.Result;
 import edu.math.diagnosis.service.CommitService;
@@ -26,19 +25,20 @@ public class PaperCommitController {
         return commitService.commit(paperCommit);
     }
 
-    @ApiOperation(value = "获取所有做过的试卷")
+    @ApiOperation(value = "获取某学生所有做过的试卷")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "status", value = "已完成：aleady  未完成：notaleady;  不填则代表全部", paramType = "query"),
+            @ApiImplicitParam(name = "name", value = "用户姓名，可无", paramType = "query"),
+            @ApiImplicitParam(name = "pid", value = "试卷Id，可无", paramType = "query"),
     })
     @RequestMapping(value = "/listPaperCommit", method = RequestMethod.GET)
     public List<PaperCommit> listPaperCommit(@RequestParam(required = false) String name,
                                              @RequestParam(required = false) Long pid,
                                              @RequestParam(defaultValue = "0") Long startTime,
                                              @RequestParam(required = false) Long endTime) {
-        if(endTime == null){
+        if (endTime == null) {
             endTime = System.currentTimeMillis();
         }
-        return commitService.listPaperCommit(name,pid,startTime,endTime);
+        return commitService.listPaperCommit(name, pid, startTime, endTime);
     }
 
 }

src/main/java/edu/math/diagnosis/dao/PaperCommitRepo.java

@@ -3,10 +3,14 @@ package edu.math.diagnosis.dao;
 import edu.math.diagnosis.entity.PaperCommit;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 /**
  * @AUTHOR: DaiFengWen
  * @DATE: Create in 2018/7/7 11:54
  * @DESCRIPTION:
  */
 public interface PaperCommitRepo extends JpaRepository<PaperCommit, Long> {
+
+    List<PaperCommit> findByPidOrNameContaining(Long pid,String name);
 }

src/main/java/edu/math/diagnosis/service/CommitService.java

@@ -1,6 +1,9 @@
 package edu.math.diagnosis.service;
 
-import edu.math.diagnosis.dao.*;
+import edu.math.diagnosis.dao.OptionRepo;
+import edu.math.diagnosis.dao.PaperCommitRepo;
+import edu.math.diagnosis.dao.QuestionRepo;
+import edu.math.diagnosis.dao.ReportRepo;
 import edu.math.diagnosis.entity.*;
 import edu.math.diagnosis.model.Answer;
 import edu.math.diagnosis.model.QuestionDetail;
@@ -32,8 +35,6 @@ public class CommitService {
     @Resource
     private OptionRepo optionRepo;
     @Resource
-    private PaperResultRepo paperResultRepo;
-    @Resource
     private PaperService paperService;
     @Resource
     private UserService userService;
@@ -47,7 +48,7 @@ public class CommitService {
         PaperResult result = new PaperResult();
         result.setName(commit.getName());
         result.setPid(commit.getPid());
-        paperResultRepo.save(result);
+        paperResultService.save(result);
         DiagnosisReport report = new DiagnosisReport();
         report.setName(commit.getName());
         report.setPrid(result.getId());
@@ -123,12 +124,10 @@ public class CommitService {
         paperCommitRepo.saveAndFlush(paperCommit);
         logger.info("uid={},name={},pid={} commit paper success", paperCommit.getUid(), paperCommit.getName(), paperCommit.getPid());
 
-        return  paperResultService.parseResult(paperCommit,paper);
+        return paperResultService.parseResult(paperCommit, paper);
     }
 
-
     public List<PaperCommit> listPaperCommit(String name, Long pid, Long startTime, Long endTime) {
-        return null;
-
+        return paperCommitRepo.findByPidOrNameContaining(pid, name);
     }
 }

src/main/java/edu/math/diagnosis/service/PaperResultService.java

@@ -3,6 +3,7 @@ package edu.math.diagnosis.service;
 import edu.math.diagnosis.dao.PaperResultRepo;
 import edu.math.diagnosis.entity.Paper;
 import edu.math.diagnosis.entity.PaperCommit;
+import edu.math.diagnosis.entity.PaperResult;
 import edu.math.diagnosis.model.Result;
 import org.springframework.stereotype.Service;
 
@@ -16,10 +17,13 @@ public class PaperResultService {
     @Resource
     private PaperService paperService;
 
-    public Result parseResult(PaperCommit paperCommit, Paper paper){
+    public Result parseResult(PaperCommit paperCommit, Paper paper) {
 
         return Result.ok();
     }
 
 
+    public PaperResult save(PaperResult result) {
+        return paperResultRepo.save(result);
+    }
 }