Merge branch 'dev_phase3' into release

server/src/main/java/com/pica/cloud/online/exam/analysis/server/controller/AnalysisController.java

@@ -108,9 +108,17 @@ public class AnalysisController {
             /**
              * chc活动固定返回两轮, 将第一轮设置为所有
              */
-            if (roundList.size() == 2) {
+            if (roundList.size() > 0) {
                 roundList.get(0).setRoundId(-1);
             }
+            /**
+             * 如果是最后一起, 补上最后一期 和前端约定为-2
+             */
+            if (roundList.size() == 1) {
+                AnalysisRoundDto analysisRoundDto = new AnalysisRoundDto();
+                analysisRoundDto.setRoundId(-2);
+                roundList.add(analysisRoundDto);
+            }
 
             analysisDto.setRoundList(roundList);
             builder.setData(analysisDto);