Merge branch 'dev_phase2' into release

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

@@ -142,6 +142,15 @@ public class AnalysisController {
             ExamTitleDto examTitleDto = analysisService.getExamTitleDtoById(examTitleId);
             List<ReplyDto> replyDtoList = analysisService.getReplyListDtoByExamTitleId(examTitleId, user !=  null ? user.getId() : 0);
 
+            /**
+             * TODO: 如果是PSA 删除时间显示
+             */
+            if (analysisRoundExamTitle.getAnalysisId().intValue() == 2 ) {
+                for (ReplyDto replyDto : replyDtoList) {
+                    replyDto.setReplayTime("");
+                }
+            }
+
             examTitleReplyDto.setAnalysisId(analysisRoundExamTitle.getAnalysisId());
             examTitleReplyDto.setRoundId(analysisRoundExamTitle.getRoundId());
             examTitleReplyDto.setExamTitle(examTitleDto);

server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/impl/CHCAnalysisServiceImpl.java

@@ -163,6 +163,14 @@ public class CHCAnalysisServiceImpl implements CHCAnalysisService {
     public List<ExamTitleDto> getExamTitleListByRoundId(Integer roundId) {
         List<AnalysisRoundExamTitle> roundExamTitleList = analysisRoundExamTitleMapper.selectExamTitleListByRoundId(roundId);
 
+        /**
+         * TODO: 上一轮的id 测试用
+         */
+        if (roundId == 2) {
+            List<AnalysisRoundExamTitle> roundExamTitleList1 = analysisRoundExamTitleMapper.selectExamTitleListByRoundId(1);
+            roundExamTitleList.addAll(roundExamTitleList1);
+        }
+
         if (null == roundExamTitleList) {
             return null;
         }
@@ -193,6 +201,15 @@ public class CHCAnalysisServiceImpl implements CHCAnalysisService {
         examTitleDto.setType(analysisRoundExamTitle.getExamTitleType());
         examTitleDto.setQuestion(analysisRoundExamTitle.getSeqNo().toString() + "." + analysisRoundExamTitle.getQuestion());
 
+        /**
+         * TODO: 删除 临时使用
+         */
+        if (analysisRoundExamTitle.getRoundId().intValue() == 1) {
+            examTitleDto.setQuestion("[第一期]" + examTitleDto.getQuestion());
+        } else if (analysisRoundExamTitle.getRoundId().intValue() == 2) {
+            examTitleDto.setQuestion("[第二期]" + examTitleDto.getQuestion());
+        }
+
         /**
          * 设置选项
          */