答卷管理

qirong

2023-06-16 a902b3ea7d5ec9b73c9ab54d09a6ab23fd5acb35

答卷管理

 log/xzs.20230616.log

Diff too large

 src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java

@@ -35,6 +35,8 @@
    public RestResponse<PageInfo<ExamPaperAnswerPageResponseVM>> pageJudgeList(@RequestBody ExamPaperAnswerPageRequestVM model) {
        PageInfo<ExamPaperAnswer> pageInfo = examPaperAnswerService.adminPage(model);
        PageInfo<ExamPaperAnswerPageResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> {
            User user = userService.selectById(e.getCreateUser());
//            if(user.getUserName().)
            ExamPaperAnswerPageResponseVM vm = modelMapper.map(e, ExamPaperAnswerPageResponseVM.class);
            Subject subject = subjectService.selectById(vm.getSubjectId());
            vm.setDoTime(ExamUtil.secondToVM(e.getDoTime()));
@@ -43,7 +45,7 @@
            vm.setPaperScore(ExamUtil.scoreToVM(e.getPaperScore()));
            vm.setSubjectName(subject.getName());
            vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
            User user = userService.selectById(e.getCreateUser());

            vm.setUserName(user.getUserName());
            return vm;
        });

 src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java

@@ -122,7 +122,7 @@
    }

    @PostMapping("/import")
    public void importUser(@RequestPart("file") MultipartFile file) throws Exception {
    public RestResponse importUser(@RequestPart("file") MultipartFile file) throws Exception {
        List<QuestionEditVO> questionEditVOS = ExcelUtils.readMultipartFile(file, QuestionEditVO.class)
                .stream().map(e -> {
                    e.setQuestionType(QuestionTypeEnum.get(e.getType()));
@@ -179,5 +179,6 @@
            questionService.insertFullQuestion(vm, getCurrentUser().getId());
            questionEditItemVMS.clear();
        }
        return RestResponse.ok();
    }
}

 src/main/java/com/mindskip/xzs/viewmodel/admin/paper/ExamPaperAnswerPageRequestVM.java

@@ -5,6 +5,10 @@
public class ExamPaperAnswerPageRequestVM extends BasePage {
    private Integer subjectId;

    private String userName;

    private String paperName;

    public Integer getSubjectId() {
        return subjectId;
    }
@@ -12,4 +16,20 @@
    public void setSubjectId(Integer subjectId) {
        this.subjectId = subjectId;
    }

    public String getUserName() {
        return userName;
    }

    public void setUserName(String userName) {
        this.userName = userName;
    }

    public String getPaperName() {
        return paperName;
    }

    public void setPaperName(String paperName) {
        this.paperName = paperName;
    }
}

 src/main/java/com/mindskip/xzs/viewmodel/admin/question/QuestionPageRequestVM.java

@@ -8,7 +8,7 @@

    private Integer id;
    private Integer level;
    private Integer subjectId;
    private Integer[] subjectId;
    private Integer questionType;
    private String content;

@@ -29,11 +29,11 @@
        this.level = level;
    }

    public Integer getSubjectId() {
    public Integer[] getSubjectId() {
        return subjectId;
    }

    public void setSubjectId(Integer subjectId) {
    public void setSubjectId(Integer[] subjectId) {
        this.subjectId = subjectId;
    }


 src/main/resources/mapper/ExamPaperMapper.xml

@@ -256,14 +256,17 @@

  <select id="taskExamPage" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.viewmodel.admin.exam.ExamPaperPageRequestVM">
    SELECT
    <include refid="Base_Column_List"/>
    FROM t_exam_paper
    e.*
    FROM t_exam_paper e
    LEFT JOIN t_exam_paper_department s on s.exam_paper_id = e.id
    <where>
      and deleted=0
      and task_exam_id is null
      and grade_level= #{level}
      and paper_type=#{paperType}
      and e.deleted=0 and s.deleted = 0
      and e.task_exam_id is null
      and s.department_id =
        #{level}
      and e.paper_type=#{paperType}
    </where>
    group by e.id
  </select>

  <select id="studentPage" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.viewmodel.student.exam.ExamPaperPageVM">

 src/main/resources/mapper/QuestionMapper.xml

@@ -192,10 +192,11 @@
        and q.grade_level= #{level}
      </if>
      <if test="subjectId != null ">
        and qs.subject_id =
        and qs.subject_id in
        <foreach item="subjectId" collection="subjectId" open="(" separator=","
                 close=")">
          #{subjectId}


        </foreach>
      </if>
      <if test="questionType != null ">
        and q.question_type= #{questionType}