去除考试类型

zengh

2021-07-20 4ec7343bd6cf2c708f6abe038b1787f75b712e3c

去除考试类型

 src/main/java/org/springblade/modules/exam/entity/ExamScore.java

@@ -57,8 +57,8 @@
    /**
     * 考试类型 0：正式考试  1： 模拟考试  2：在线联系  3：调查问卷
     */
    @TableField("exam_type")
    private Integer examType;
//    @TableField("exam_type")
//    private Integer examType;


    /**

 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml

@@ -21,9 +21,9 @@
        <if test="examScore.securityName!=null and  examScore.securityName!=''">
            and security_name like concat('%', #{examScore.securityName},'%')
        </if>
        <if test="examScore.examType!=null">
            and exam_type = #{examScore.examType}
        </if>
<!--        <if test="examScore.examType!=null">-->
<!--            and exam_type = #{examScore.examType}-->
<!--        </if>-->
    </select>

    <!--考试成绩详情信息-->

 src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java

@@ -76,7 +76,7 @@
                    if (examResultVO.getSubjectChoicesId().equals(examExaminationSubject.getExamSubjectChoices().getId())) {
                        //对比答案

                        if (examExaminationSubject.getExamSubjectChoices().getChoicesType() == 2){
                        if (examExaminationSubject.getExamSubjectChoices().getChoicesType() == 2 || examExaminationSubject.getExamSubjectChoices().getChoicesType() == 3){
                            //判断题逻辑
                            if (examResultVO.getValue().equals(examExaminationSubject.getExamSubjectChoices().getAnswer())) {
                                theoryGrade += examResultVO.getGrade();