fix 2.0

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/dao/Paper2CaseDao.java

@@ -15,12 +15,12 @@ import java.util.List;
 @Transactional
 public interface Paper2CaseDao extends CrudRepository<Paper2Case, Long> {
 
-    Paper2Case findByExamIdAndCaseId(long examId, long caseId);
+    Paper2Case findByPaperIdAndCaseId(long paperId, long caseId);
 
-    List<Paper2Case> findByExamId(long examId);
+    List<Paper2Case> findByPaperId(long paperId);
 
-    @Query("SELECT MAX(t2c.caseIndex) FROM Paper2Case t2c WHERE t2c.examId = :examId")
-    Integer findMaxCaseIndexByExamId(@Param("examId") long examId);
+    @Query("SELECT MAX(t2c.caseIndex) FROM Paper2Case t2c WHERE t2c.paperId = :paperId")
+    Integer findMaxCaseIndexByPaperId(@Param("paperId") long paperId);
 
     List<Paper2Case> findByCaseId(long caseId);
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/dao/PaperDao.java

@@ -19,10 +19,10 @@ public interface PaperDao extends PagingAndSortingRepository<Paper, Long>, JpaSp
 
     Paper findById(long paperId);
 
-    @Query("select p from Paper p,Paper2Case t2c where t2c.caseId=:caseId and t2c.examId=p.id and p.isDeleted=0 and p.isPublic=1")
+    @Query("select p from Paper p,Paper2Case t2c where t2c.caseId=:caseId and t2c.paperId=p.id and p.isDeleted=0 and p.isPublic=1")
     Page<Paper> findByCaseId(@Param("caseId") Long caseId, Pageable pageable);
 
-    @Query("select p from Paper p,Paper2Case t2c where t2c.caseId=:caseId and t2c.examId=p.id and p.isDeleted=0 and p.isPublic=0 " +
+    @Query("select p from Paper p,Paper2Case t2c where t2c.caseId=:caseId and t2c.paperId=p.id and p.isDeleted=0 and p.isPublic=0 " +
             "and p.ownerId=:ownerId")
     Page<Paper> findByCaseIdPrivate(@Param("caseId") Long caseId,
                                     @Param("ownerId") Long ownerId, Pageable pageable);

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/models/Paper2Case.java

@@ -44,7 +44,7 @@ public class Paper2Case {
         return paperId;
     }
 
-    public void setExamId(Long paperId) {
+    public void setPaperId(Long paperId) {
         this.paperId = paperId;
     }
 

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/rpc/Oauth2/impl/ExamServiceImpl2.java

@@ -196,7 +196,7 @@ public class ExamServiceImpl2 implements ExamService {
 
         for (Long id : caseNameMap.keySet()) {
             Paper2Case paper2Case = new Paper2Case();
-            paper2Case.setExamId(paper.getId());
+            paper2Case.setPaperId(paper.getId());
             paper2Case.setAutoSelect(true);
             paper2Case.setCaseId(id);
             paper2Case.setCaseIndex(0);

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/ExamServiceImpl.java

@@ -226,7 +226,7 @@ public class ExamServiceImpl extends BaseService implements ExamService {
 
     @Override
     public List<CaseBlock> getCaseBlocks(long taskId) {
-        List<Paper2Case> paper2Cases = paper2CaseDao.findByExamId(taskId);
+        List<Paper2Case> paper2Cases = paper2CaseDao.findByPaperId(taskId);
         return getCaseBlocks(paper2Cases);
     }
 

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/PaperServiceImpl.java

@@ -92,7 +92,7 @@ public class PaperServiceImpl extends BaseService implements PaperService {
 
     @Override
     public List<Paper2Case> copyCase(long oldPaperId, long newPaperId) {
-        List<Paper2Case> oldCases = paper2CaseDao.findByExamId(oldPaperId);
+        List<Paper2Case> oldCases = paper2CaseDao.findByPaperId(oldPaperId);
         List<Paper2Case> newCases = new ArrayList<>();
         for(Paper2Case paper2Case : oldCases){
             Paper2Case t2c = new Paper2Case();
@@ -100,7 +100,7 @@ public class PaperServiceImpl extends BaseService implements PaperService {
             t2c.setCount(paper2Case.getCount());
             t2c.setWeight(paper2Case.getWeight());
             t2c.setCaseId(paper2Case.getCaseId());
-            t2c.setExamId(newPaperId);
+            t2c.setPaperId(newPaperId);
             t2c.setAutoSelect(true);
             newCases.add(paper2CaseDao.save(t2c));
         }
@@ -110,7 +110,7 @@ public class PaperServiceImpl extends BaseService implements PaperService {
     @Override
     public void updateCaseAndWeight(long paperId, List<CaseBlockVO> caseBlocks) {
 
-        Integer maxCaseIndex = paper2CaseDao.findMaxCaseIndexByExamId(paperId);
+        Integer maxCaseIndex = paper2CaseDao.findMaxCaseIndexByPaperId(paperId);
         if(maxCaseIndex == null) {
             maxCaseIndex = 0;
         }
@@ -126,12 +126,12 @@ public class PaperServiceImpl extends BaseService implements PaperService {
         int remainder = total_score % case_num;
         for (CaseBlockVO caseBlock : caseBlocks) {
             for(Long caseId : caseBlock.getCaseIds()) {
-                Paper2Case paper2Case = paper2CaseDao.findByExamIdAndCaseId(paperId, caseId);
+                Paper2Case paper2Case = paper2CaseDao.findByPaperIdAndCaseId(paperId, caseId);
                 if(paper2Case == null) {
                     paper2Case = new Paper2Case();
                 }
                 paper2Case.setCaseId(caseId);
-                paper2Case.setExamId(paperId);
+                paper2Case.setPaperId(paperId);
                 if(total_score / average >1){
                     paper2Case.setWeight((double)average/100);
                     total_score -= average;
@@ -155,7 +155,7 @@ public class PaperServiceImpl extends BaseService implements PaperService {
 
     @Override
     public boolean deletePaperCase(long paperId, long caseId) {
-        Paper2Case paper2Case = paper2CaseDao.findByExamIdAndCaseId(paperId, caseId);
+        Paper2Case paper2Case = paper2CaseDao.findByPaperIdAndCaseId(paperId, caseId);
         if(paper2Case == null) {
             throw new IllegalArgumentException("该试卷不存在这道题！");
         }