xiangpei
2024-06-26 c5b38a50819d7ac782a4379bd9eda890d7d119a8
班级、试卷、开始考试优化
5个文件已修改
37 ■■■■■ 已修改文件
src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ycl/jxkg/service/ClassesService.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/QuestionMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
@@ -72,6 +72,13 @@
        return classesService.dissolution(id);
    }
    @PutMapping("/recover/{id}")
    @ApiOperation(value = "恢复正常", notes = "恢复正常")
    @PreAuthorize("hasAuthority('classes:recover')")
    public Result recover(@PathVariable("id") Integer id) {
        return classesService.recover(id);
    }
    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    @PreAuthorize("hasAuthority('classes:detail')")
src/main/java/com/ycl/jxkg/service/ClassesService.java
@@ -80,10 +80,17 @@
    Result dissolution(Integer id);
    /**
     *
     * 我的班级
     *
     * @return
     */
    Result myClassList();
    /**
     * 恢复正常
     *
     * @param id
     * @return
     */
    Result recover(Integer id);
}
src/main/java/com/ycl/jxkg/service/impl/ClassesServiceImpl.java
@@ -144,4 +144,13 @@
                .list();
        return Result.ok(list);
    }
    @Override
    public Result recover(Integer id) {
        new LambdaUpdateChainWrapper<>(baseMapper)
                .eq(Classes::getId, id)
                .set(Classes::getStatus, ClassesStatusEnum.NORMAL)
                .update();
        return Result.ok("班级已经恢复正常");
    }
}
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -25,6 +25,7 @@
import lombok.RequiredArgsConstructor;
import com.ycl.jxkg.utils.PageUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -138,6 +139,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result start(Integer id) {
        Exam exam = baseMapper.selectById(id);
        if (Objects.isNull(exam)) {
@@ -201,6 +203,14 @@
                paperFixQuestionVO.setQuestionList(childQuestions);
                examData.add(paperFixQuestionVO);
            }
            ExamSubmitTemp examSubmitTemp = new ExamSubmitTemp();
            examSubmitTemp.setExamId(id);
            examSubmitTemp.setStatus(ExamSubmitTempStatusEnum.TEMP);
            examSubmitTemp.setExamSubmit(JSON.toJSONString(examData));
            examSubmitTemp.setCreateTime(new Date());
            examSubmitTemp.setUserId(webContext.getCurrentUser().getId());
            examSubmitTemp.setMarkPaperStatus(ExamSubmitTempStatusEnum.TEMP);
            examSubmitTempMapper.insert(examSubmitTemp);
            return Result.ok(examData);
        }
        return Result.ok();
src/main/resources/mapper/QuestionMapper.xml
@@ -112,7 +112,7 @@
        FROM
             t_question tq
        WHERE
              tq.subject_id = #{subjectId}
              tq.subject_id = #{subjectId} AND tq.question_type = #{questionType} AND tq.deleted = 0
        ORDER BY
                 RAND()
        LIMIT #{num}