成绩查询接口修改

Administrator

2021-08-21 7df0c1546195b5fdf2228f976652afe1cf904233

成绩查询接口修改

 src/main/java/org/springblade/modules/apply/controller/ApplyController.java

@@ -628,6 +628,7 @@
        ExamScore examScore = new ExamScore();
        examScore.setExamId(apply.getExamId().toString());
        examScore.setUserId(apply.getUserId().toString());
        examScore.setApplyId(apply.getId());
        examScore.setExamTime(new Date());
        //新增
        examScoreService.save(examScore);

 src/main/java/org/springblade/modules/dispatcher/vo/DispatcherUnitVO.java

@@ -42,4 +42,9 @@
     * 派遣单位名称
     */
    private String dispatcherUnitName;

    /**
     * 派遣人数
     */
    private Integer num;
}

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

@@ -112,6 +112,13 @@
    private String examId;


    /**
     * 报名id
     */
    @TableField("apply_id")
    private Long applyId;






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

@@ -5,34 +5,32 @@
    <!--考试成绩分页信息-正式考试-->
    <select id="selectExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
        SELECT
            es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
            es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,
            ke.exam_name examName,
            bu.real_name securityName,company,bu.account,
            sa.is_exam isExam,
            bd.dept_name companyName
        FROM
        sys_apply sa
        es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
        es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,
        ke.exam_name examName,
        sa.is_exam isExam,
        bu.real_name securityName,company,bu.account,
        bd.dept_name companyName from
        exam_score es
        left join
        ksxt_exam ke
        on
        ke.id = es.exam_id
        left join
        blade_user bu
        on
        sa.user_id = bu.id
        es.user_id = bu.id
        left join
        blade_dept bd
        on
        bd.id = bu.dept_id
        left join
        ksxt_exam ke
        sys_apply sa
        on
        ke.id = sa.exam_id
        left join
        exam_score es
        on
        es.exam_id = sa.exam_id
        sa.id = es.apply_id
        where
        1=1
        and (sa.is_exam = 2 or sa.is_exam = 3)
        and ke.exam_type = 1
        <if test="examScore.examName!=null and  examScore.examName!=''">
            and ke.exam_name like concat('%', #{examScore.examName},'%')
        </if>
@@ -66,28 +64,27 @@
            es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
            es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,
            ke.exam_name examName,
            bu.real_name securityName,company,bu.account,
            str.is_exam isExam,
            bd.dept_name companyName
        FROM
        sys_training_registration str
            bu.real_name securityName,company,bu.account,
            bd.dept_name companyName from
            exam_score es
        left join
        ksxt_exam ke
        on
        ke.id = es.exam_id
        left join
        blade_user bu
        on
        str.user_id = bu.id
        es.user_id = bu.id
        left join
        blade_dept bd
        on
        bd.id = bu.dept_id
        left join
        ksxt_exam ke
        sys_training_registration str
        on
        ke.id = str.train_exam_id
        left join
        exam_score es
        on
        es.exam_id = str.train_exam_id
        WHERE
        str.id = es.apply_id
        where
        1=1
        and (str.is_exam = 2 or str.is_exam = 3)
        <if test="examScore.examName!=null and  examScore.examName!=''">

 src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java

@@ -75,9 +75,8 @@
        if (data.size()>0){
            data.forEach(trainingRegistrationExcel -> {
                TrainingRegistration trainingRegistration = new TrainingRegistration();
                //通过准考证号
                //通过身份证号
                if (null!=trainingRegistrationExcel.getIdCardNo() && trainingRegistrationExcel.getIdCardNo()!=""){
                    trainingRegistration.setCandidateNo(trainingRegistrationExcel.getIdCardNo());
                    User user = userService.getUserInfoByIdCardNo(trainingRegistrationExcel.getIdCardNo());
                    trainingRegistration.setUserId(user.getId().toString());