修改bug

0是开始
1进行中
2已完成

src/main/java/org/rcisoft/business/postblesson/dto/queryTeaExamOptionsDTO.java

@@ -24,4 +24,9 @@ public class queryTeaExamOptionsDTO {
      * 状态
      */
     private String status;
+
+    /**
+     * 备注
+     * */
+    private String remarks;
 }

src/main/java/org/rcisoft/business/postblesson/enums/ItemStatus.java

@@ -12,12 +12,16 @@ import lombok.AllArgsConstructor;
 public enum ItemStatus {
    //未开始
     NOT_START("0"),
+
 //    未结束
     LEARNING("1"),
 //    已完成
     FINISH("2"),
     //已删除
-    DELETE("3");
+    DELETE("3"),
+    //答题中
+    RUNNING("4")
+    ;
     private  String status;
 
     public  String getStatus(){

src/main/java/org/rcisoft/business/postblesson/service/impl/PostBLessonServiceImpl.java

@@ -455,8 +455,15 @@ public class PostBLessonServiceImpl extends ServiceImpl<PostBLessonRepository, P
         if (StringUtils.isBlank(courseId)) {
             return null;
         }
+
+
+
+
+
+
         queryTeaExamOptionsDTO queryTeaExamOptionsDTO = baseMapper.queryTeaExamOptions(courseId, questionBankVO.getUserId());
-        if (queryTeaExamOptionsDTO == null || queryTeaExamOptionsDTO.getStatus().equals(ItemStatus.NOT_START.getStatus())) {
+        //无记录 未答题 给创建
+        if (queryTeaExamOptionsDTO == null ) {
             //开始答题
             answerStatus.setStatus(ItemStatus.NOT_START.getStatus());
             PostTeaExamExaminationPaper postTeaExamExaminationPaper = new PostTeaExamExaminationPaper();
@@ -465,20 +472,53 @@ public class PostBLessonServiceImpl extends ServiceImpl<PostBLessonRepository, P
             postTeaExamExaminationPaper.setAnswerId(Integer.valueOf(CyUserUtil.getAuthenBusinessId()));
             postTeaExamExaminationPaper.setStartTime(new Date());
             postTeaExamExaminationPaper.setStatus(ItemStatus.LEARNING.getStatus());
+            postTeaExamExaminationPaper.setRemarks(ItemStatus.NOT_START.getStatus());
             teaExamExaminationPaperRepository.insert(postTeaExamExaminationPaper);
             answerStatus.setBusinessId(postTeaExamExaminationPaper.getBusinessId());
-        } else {
-            if (queryTeaExamOptionsDTO.getStatus().equals(ItemStatus.FINISH.getStatus())) {
-                //重新答题
-                answerStatus.setStatus(ItemStatus.FINISH.getStatus());
-            }
-            if (queryTeaExamOptionsDTO.getStatus().equals(ItemStatus.LEARNING.getStatus())) {
-                //继续答题
-                answerStatus.setStatus(ItemStatus.LEARNING.getStatus());
-            }
+            answerStatus.setLessonId(courseId);
+            return answerStatus;
+        }
+        //完成答题
+        if (queryTeaExamOptionsDTO.getStatus().equals(ItemStatus.FINISH.getStatus())) {
+            PostTeaExamExaminationPaper postTeaExamExaminationPaper = new PostTeaExamExaminationPaper();
+            postTeaExamExaminationPaper.setFlag("1");
+            postTeaExamExaminationPaper.setCourseId(courseId);
+            postTeaExamExaminationPaper.setAnswerId(Integer.valueOf(CyUserUtil.getAuthenBusinessId()));
+            postTeaExamExaminationPaper.setStartTime(new Date());
+            postTeaExamExaminationPaper.setStatus(ItemStatus.LEARNING.getStatus());
+            postTeaExamExaminationPaper.setRemarks(ItemStatus.FINISH.getStatus());
+            teaExamExaminationPaperRepository.insert(postTeaExamExaminationPaper);
+            answerStatus.setBusinessId(postTeaExamExaminationPaper.getBusinessId());
+            answerStatus.setLessonId(courseId);
+            answerStatus.setStatus(ItemStatus.FINISH.getStatus());
+        }
+        // 第一次开始  1 0
+        if (queryTeaExamOptionsDTO.getStatus().equals(ItemStatus.LEARNING.getStatus())&& queryTeaExamOptionsDTO.getRemarks().equals(ItemStatus.NOT_START.getStatus()) ) {
             answerStatus.setBusinessId(queryTeaExamOptionsDTO.getBusinessId());
+            answerStatus.setLessonId(courseId);
+            answerStatus.setStatus(ItemStatus.NOT_START.getStatus());
+            return answerStatus;
         }
-        answerStatus.setLessonId(courseId);
+        // 继续答题
+        if (queryTeaExamOptionsDTO.getStatus().equals(ItemStatus.LEARNING.getStatus())&& queryTeaExamOptionsDTO.getRemarks().equals(ItemStatus.LEARNING.getStatus()) ) {
+            answerStatus.setBusinessId(queryTeaExamOptionsDTO.getBusinessId());
+            answerStatus.setLessonId(courseId);
+            answerStatus.setStatus(ItemStatus.LEARNING.getStatus());
+            return answerStatus;
+        }
+
+        //考完后再次考试  1 2
+         if (queryTeaExamOptionsDTO.getStatus().equals(ItemStatus.LEARNING.getStatus()) && queryTeaExamOptionsDTO.getRemarks().equals(ItemStatus.FINISH.getStatus()) ) {
+            answerStatus.setBusinessId(queryTeaExamOptionsDTO.getBusinessId());
+            answerStatus.setLessonId(courseId);
+            answerStatus.setStatus(ItemStatus.FINISH.getStatus());
+            return answerStatus;
+        }
+
+
+
+
+
         return answerStatus;
     }
 
@@ -556,6 +596,16 @@ public class PostBLessonServiceImpl extends ServiceImpl<PostBLessonRepository, P
 
     @Override
     public CyPersistModel answer(AnswerVO answerVO) {
+        //修改为3
+
+        PostTeaExamExaminationPaper postTeaExamExaminationPaper = new PostTeaExamExaminationPaper();
+        postTeaExamExaminationPaper.setBusinessId(answerVO.getRecordId());
+        postTeaExamExaminationPaper.setRemarks(ItemStatus.LEARNING.getStatus());
+        teaExamExaminationPaperRepository.updateById(postTeaExamExaminationPaper);
+
+
+
+
         //根据题目id查询题目信息
         int insert = 0;
         PostTeaExamQuestions postTeaExamQuestions =

src/main/resources/mapper/business/postblesson/mapper/PostBLessonRepository.xml

@@ -218,7 +218,7 @@
     </select>
 
     <select id="queryTeaExamOptions" resultType="org.rcisoft.business.postblesson.dto.queryTeaExamOptionsDTO">
-        SELECT status, business_id
+        SELECT status, business_id,remarks
         from tea_post_exam_examination_paper
         WHERE answer_id = #{userId}
           and course_id = #{courseId}
@@ -245,8 +245,9 @@
         FROM tea_post_exam_examination_paper
         WHERE course_id = #{courseId}
           AND answer_id = #{userId}
+          and status = 2
+          and end_time IS NOT NULL
           and del_flag = '0'
     </select>
 
-
 </mapper>