实操成绩导入逻辑修改

guoshilong

2023-12-19 8d2895b7831497255f18a4fea10762791b5b6c13

实操成绩导入逻辑修改

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

@@ -531,7 +531,7 @@
        ke.exam_name examName,date_format(ke.start_time,'%Y-%m-%d') startTime,date_format(ke.end_time,'%Y-%m-%d %H:%i:%s') endTime,
        str.is_exam isExam,
        bu.real_name securityName,company,bu.account,bu.sex,bu.paper_time paperTime,bu.securitynumber securityNumber,bu.avatar,
        bd.dept_name companyName,bu.user_type isPaper,bud.unit_name unitName
        bd.dept_name companyName,bd.id as deptId,bu.user_type isPaper,bud.unit_name unitName
        from
        exam_score es
        left join ksxt_exam ke on ke.id = es.exam_id

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

@@ -299,6 +299,7 @@
                                    examScore.setLearnGrade(1);
                                }
                                if (null != examScore.getTheoryGrade()) {
                                    //理论成绩大于60，实操成绩为合格
                                    if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() == 0) {
                                        //合格
                                        examScore.setQualified(0);
@@ -348,6 +349,9 @@

                                            myAsyncService.dataSync(s1);
                                        }
                                    }else{
                                        //其他情况全为不合格
                                        examScore.setQualified(1);
                                    }
                                } else {
                                    //不合格

 src/main/java/org/springblade/modules/signinrecords/mapper/SignInRecordsMapper.xml

@@ -70,7 +70,8 @@
            shouldTemp.shouldNum,
            realTemp.realNum,
            shouldTemp.shouldNum - realTemp.realNum AS unArriveNum,
            shouldTemp.dept_name
            shouldTemp.dept_name,
            shouldTemp.id as deptId
        FROM
            (
                SELECT
@@ -113,28 +114,38 @@
            ) realTemp ON shouldTemp.id = realTemp.id
    </select>
    <select id="getSignSituationList" resultType="org.springblade.modules.signinrecords.vo.SignInfo">
        SELECT
        SELECT * FROM (
            SELECT
            str.candidate_no,
            bu.avatar,
            bu.real_name,
            bu.cardId,
            str.train_exam_id as examId,
            bu.sex,
            bd.id AS deptId,
            bd.dept_name AS deptName,
            CASE WHEN ssir.id IS NULL THEN
                     '未签到' ELSE '已签到'
                END AS state
        FROM
            '未签到' ELSE '已签到'
            END AS state
            FROM
            sys_training_registration str
                LEFT JOIN blade_user bu ON bu.id = str.user_id
                LEFT JOIN sys_sign_in_records ssir ON ssir.candidate_no = str.candidate_no
                <if test="signInfo.examId != null and signInfo.examId !='' ">
                    AND ssir.exam_id = #{signInfo.examId}
                </if>
        WHERE str.audit_status = '1' and str.cancel = '1'
        <if test="signInfo.examId != null and signInfo.examId !='' ">
            LEFT JOIN blade_user bu ON bu.id = str.user_id
            LEFT JOIN blade_dept bd ON bd.id = bu.dept_id
            LEFT JOIN sys_sign_in_records ssir ON ssir.candidate_no = str.candidate_no
            AND ssir.exam_id = #{signInfo.examId}
            WHERE str.audit_status = '1' and str.cancel = '1'
            and str.train_exam_id = #{signInfo.examId}
            <if test="signInfo.deptId != null and signInfo.deptId !='' ">
                AND bd.id = #{signInfo.deptId}
            </if>

            ORDER BY str.candidate_no ASC
        ) result WHERE 1=1
        <if test="signInfo.state != null and signInfo.state !='' ">
            AND result.state = #{signInfo.state}
        </if>
        ORDER BY str.candidate_no ASC


    </select>

</mapper>

 src/main/java/org/springblade/modules/signinrecords/vo/SignInfo.java

@@ -27,4 +27,8 @@

    private String sex;

    private String deptId;

    private String deptName;

}

 src/main/java/org/springblade/modules/signinrecords/vo/SignStatistics.java

@@ -18,6 +18,8 @@
    //机构
    private String deptName;

    private String deptId;

    //应到
    private Integer shouldNum;