Merge remote-tracking branch 'origin/master'

zengh

2021-08-15 0cab6d8afcc97e8bc94ef200e24d8839281f44c8

 src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml

@@ -5,10 +5,11 @@
    <!--考试报名分页信息-->
    <select id="selectApplyPage" resultType="org.springblade.modules.apply.vo.ApplyVO">
        SELECT
            sa.id,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
        sa.id,sa.apply_status applyStatus,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
        sa.examination_type examinationType,sa.examination_mx examinationMx,
            ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
            bu.real_name realName,sa.examination_type,sa.examination_mx,
            bd.dept_name deptName
        bu.real_name realName,bu.is_apply isApply,
        bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
        FROM
            sys_apply sa
        left join
@@ -25,8 +26,20 @@
            bd.id = bu.dept_id
        WHERE
            1=1
        <if test="apply.name!=null and  apply.name!=''">
            and sa.name like concat('%', #{apply.name},'%')
        and is_exam = 1
        and sa.apply_status = 2
        and bu.is_apply = 1
        <if test="apply.realName!=null and  apply.realName!=''">
            and bu.real_name like concat('%', #{apply.realName},'%')
        </if>
        <if test="apply.deptName!=null and  apply.deptName!=''">
            and bd.dept_name like concat('%', #{apply.deptName},'%')
        </if>
        <if test="apply.userId!=null and  apply.userId!=''">
            and sa.user_id like concat('%', #{apply.userId},'%')
        </if>
        <if test="apply.examinationType!=null and  apply.examinationType!=''">
            and sa.examination_type = #{apply.examinationType}
        </if>
        <if test="apply.applyStatus!=null">
            and apply_status = #{apply.applyStatus}