3.3.0 update

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/ScoreInfo.java

@@ -8,7 +8,7 @@ public class ScoreInfo {
 
     private int mainNumber;
 
-    private String subNumber;
+    private Integer subNumber;
 
     private String mainTitle;
 
@@ -22,7 +22,7 @@ public class ScoreInfo {
 
     public ScoreInfo() {
         this.mainNumber = 0;
-        this.subNumber = "";
+        this.subNumber = 0;
         this.objectiveScore = BigDecimal.ZERO;
         this.subjectiveScore = BigDecimal.ZERO;
         this.totalScore = BigDecimal.ZERO;
@@ -32,11 +32,10 @@ public class ScoreInfo {
     public int incrMainNumber(String title) {
         mainTitle = title;
         mainNumber++;
-        subNumber = "";
         return mainNumber;
     }
 
-    public void addScore(String title, String number, double score, String answer, boolean objective) {
+    public void addScore(String title, Integer number, double score, String answer, boolean objective) {
 
         ScoreItem item = new ScoreItem(objective);
         item.setMainNumber(mainNumber);

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkServiceImpl.java

@@ -593,7 +593,7 @@ public class MarkServiceImpl implements MarkService {
             ss.setGroupNumber(group.getNumber());
             ss.setGroupScore(score);
             ss.setMainNumber(question.getMainNumber());
-            ss.setSubNumber(String.valueOf(question.getSubNumber()));
+            ss.setSubNumber(question.getSubNumber());
             if (score != UN_SELECTIVE_SCORE) {
                 ScoreItem item = scoreList.get(i);
                 ss.setScore(item.getScore());
@@ -722,12 +722,6 @@ public class MarkServiceImpl implements MarkService {
         return list;
     }
 
-    @Override
-    public MarkTaskDto getTask(Long userId, Long examId, String paperNumber) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
     @Override
     public void clear(Long userId, Long examId, String paperNumber,Integer groupNumber) {
     	MarkUserGroup markUserGroup = markUserGroupService.getByExamIdAndPaperNumberAndGroupNumberAndUserId(userId, null, null, userId);
@@ -830,8 +824,17 @@ public class MarkServiceImpl implements MarkService {
 	public IPage<MarkTaskDto> getHistory(Long userId, int pageNumber, int pageSize, Sort sort, Long examId,
 			String paperNumber, Integer groupNumber, String secretNumber, Double markerScore) {
 		IPage<MarkTaskDto> list = markTaskService.listPageHistory(new Page<>(pageNumber,pageSize),sort,userId,examId,paperNumber,groupNumber,secretNumber,markerScore);
-		return null;
+		for (MarkTaskDto dto : list.getRecords()) {
+		}
+		return list;
 	}
+	
+
+    @Override
+    public MarkTaskDto getTask(Long userId, Long examId, String paperNumber) {
+        // TODO Auto-generated method stub
+        return null;
+    }
 
 	@Override
 	public String saveTask(Long userId, MarkResult markResult) {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkSubjectiveScoreServiceImpl.java

@@ -33,7 +33,7 @@ public class MarkSubjectiveScoreServiceImpl extends ServiceImpl<MarkSubjectiveSc
         }
 
         List<MarkSubjectiveScore> list = this.list(queryWrapper);
-        sort(list);
+//        sort(list);
         return list;
     }
 
@@ -73,26 +73,26 @@ public class MarkSubjectiveScoreServiceImpl extends ServiceImpl<MarkSubjectiveSc
         this.remove(updateWrapper);
     }
 
-    private void sort(List<MarkSubjectiveScore> list) {
-        list.sort((o1, o2) -> {
-            int i = o1.getMainNumber() - o2.getMainNumber();
-            if (i == 0) {
-                if (o1.getSubNumber().contains("-")) {
-                    String[] o1s = o1.getSubNumber().split("-");
-                    String[] o2s = o2.getSubNumber().split("-");
-                    int j = Integer.parseUnsignedInt(o1s[0]) - Integer.parseUnsignedInt(o2s[0]);
-                    if (j == 0) {
-                        return Integer.parseUnsignedInt(o1s[1]) - Integer.parseUnsignedInt(o2s[1]);
-                    } else {
-                        return j;
-                    }
-                } else {
-                    return Integer.parseUnsignedInt(o1.getSubNumber()) - Integer.parseUnsignedInt(o2.getSubNumber());
-                }
-            }
-            return i;
-        });
-    }
+//    private void sort(List<MarkSubjectiveScore> list) {
+//        list.sort((o1, o2) -> {
+//            int i = o1.getMainNumber() - o2.getMainNumber();
+//            if (i == 0) {
+//                if (o1.getSubNumber().contains("-")) {
+//                    String[] o1s = o1.getSubNumber().split("-");
+//                    String[] o2s = o2.getSubNumber().split("-");
+//                    int j = Integer.parseUnsignedInt(o1s[0]) - Integer.parseUnsignedInt(o2s[0]);
+//                    if (j == 0) {
+//                        return Integer.parseUnsignedInt(o1s[1]) - Integer.parseUnsignedInt(o2s[1]);
+//                    } else {
+//                        return j;
+//                    }
+//                } else {
+//                    return Integer.parseUnsignedInt(o1.getSubNumber()) - Integer.parseUnsignedInt(o2.getSubNumber());
+//                }
+//            }
+//            return i;
+//        });
+//    }
 
 	@Override
 	public List<QuestionVo> getSubjectiveVo(Long examId, String paperNumber) {

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/utils/ScoreCalculateUtil.java

@@ -87,7 +87,7 @@ public class ScoreCalculateUtil {
 
             // log.debug("question result: " + question.getNumber() + ", " +
             // answer + ", " + score);
-            scoreInfo.addScore(null, String.valueOf(question.getSubNumber()), score, answer, true);
+            scoreInfo.addScore(null, question.getSubNumber(), score, answer, true);
         }
     }