Merge branch 'fix-uploadTypeScore' into 'Test'

提交







See merge request !1026

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

@@ -40,7 +40,7 @@ public class UploadRecord {
     @Column(name = "upload_time")
     String uploadTime;
 
-    @Column(name = "apply_upload_record")
+    @Column(name = "apply_upload_id")
     Long applyUploadId;
 
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/CalculateScoreLogicImpl.java

@@ -577,9 +577,9 @@ public class CalculateScoreLogicImpl extends BaseLogic implements CalculateSocre
             uploadRecordDTO.setExamId(examId);
             uploadRecordDTO.setCaseId(caseId);
             uploadRecordDTO.setWorkerId(userId);
+            uploadRecordDTO.setUploadTime(uploadTime);
             uploadRecordDTO.setApplyUploadId(applyUploadId);
         }
-        uploadRecordDTO.setUploadTime(uploadTime);
         uploadRecordDTO.setOSSUrl(ossUrl);
         uploadRecordDTO.setSource(source);
 

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/logic/impl/GeneralCalculateScoreComponentTest.java

@@ -158,7 +158,7 @@ public class GeneralCalculateScoreComponentTest {
                         "5b2fc1dcd7fa0b6acb62816"), "5b2fdac0d7fa0b6acb628193");
         userCatchDTOList.add(userCatchDTO);
 
-        uploadRecordDTO = new UploadRecordDTO(1L,1105L,1804L,824L,"xxx","xx","1234567");
+        uploadRecordDTO = new UploadRecordDTO(1L,1105L,1804L,824L,"xxx","xx","1234567",1L);
 
 
 //    UserCatchDTO userCatchDTO = new UserCatchDTO("1",1L,1L,1L,Arrays.asList(catchDTO1,