培训查询修改

Administrator

2021-11-26 3013329b493ea1c1a34ec34af93b8d380c951c23

培训查询修改

 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml

@@ -1750,16 +1750,17 @@
        u.photo,
        u.examination_type,
        u.dispatch,
        i.enterpriseName
        bd.dept_name enterpriseName
        FROM
        blade_user u
        LEFT JOIN sys_information i ON i.departmentid = u.dept_id
        LEFT JOIN blade_dept bd ON bd.id = u.dept_id
        WHERE
        u.role_id = '1412226235153731586'
        AND u.is_deleted = 0
        AND u.`status` =1
        AND u.`status` = 1
        and bd.is_deleted = 0
        <if test="deptid!=null and deptid!=''">
            and dept_id=#{deptid}
            and (bd.id = #{deptid} or bd.parent_id = #{deptid})
        </if>
        <if test="name!=null and name!=''">
            and real_name like concat('%', #{name},'%')

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -246,6 +246,12 @@
        <if test="user.sex!=null and user.sex != ''">
            and bu.sex = #{user.sex}
        </if>
        <if test="user.examinationType==0">
            and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type="")
        </if>
        <if test="user.examinationType==1">
            and bu.examination_type = #{user.examinationType}
        </if>
        <if test="user.status!=null and user.status != ''">
            and bu.status = #{user.status}
        </if>
@@ -265,7 +271,7 @@
            and bu.paper_time &lt;= #{user.endTime}
        </if>
        <if test="user.useName==null or user.useName==''">
            order by bu.id
            order by bu.examination_type desc,bu.id
        </if>
        <if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'">
            order by bu.examination_type ${user.sort}
@@ -325,7 +331,7 @@
    <select id="getUserInfoBySecurityNumber" resultType="org.springblade.modules.system.vo.UserVO">
        select bu.*,
               ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid, 7, 4), 0) age,
               bd.dept_name                                                  deptName
               bd.dept_name deptName
        from blade_user bu
                 left join
             blade_dept bd
@@ -343,7 +349,7 @@
        bu.cardid,
        ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
        bu.phone,
        if(bu.examination_type=0,'正常','异常') examinationType,
        if(bu.examination_type=1,'异常','正常') examinationType,
        bu.examination_mx examinationMx,
        bu.paper_time paperTime
        from
@@ -401,7 +407,7 @@
            and bu.securitynumber like concat('%', #{user.securitynumber},'%')
        </if>
        <if test="user.deptId!=null and user.deptId!=''">
            and bu.dept_id =#{user.deptId}
            and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
        </if>
        <if test="user.startTime!=null and user.startTime!=''">
            and bu.paper_time &gt;= #{user.startTime}
@@ -409,8 +415,14 @@
        <if test="user.endTime!=null and user.endTime!=''">
            and bu.paper_time &lt;= #{user.endTime}
        </if>
        <if test="user.examinationType==0">
            and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type="")
        </if>
        <if test="user.examinationType==1">
            and bu.examination_type = #{user.examinationType}
        </if>
        <if test="user.useName==null or user.useName==''">
            order by bu.id
            order by bu.examination_type desc,bu.id
        </if>
        <if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'">
            order by bu.examination_type ${user.sort}

 src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml

@@ -52,6 +52,9 @@
        <if test="trainingRegistration.realName!=null and  trainingRegistration.realName!=''">
            and bu.real_name like concat('%', #{trainingRegistration.realName},'%')
        </if>
        <if test="trainingRegistration.idCardNo!=null and  trainingRegistration.idCardNo!=''">
            and bu.cardid like concat('%', #{trainingRegistration.idCardNo},'%')
        </if>
        <if test="trainingRegistration.cancel!=null">
            and sr.cancel = #{trainingRegistration.cancel}
        </if>

 src/main/resources/application-dev.yml

@@ -5,11 +5,11 @@
    host: 127.0.0.1

#   内网
    port: 6378
    password: redispsw
#    port: 6378
#    password: redispsw

#    port: 6379
#    password:
    port: 6379
    password:

    database: 0
    ssl: false
@@ -61,7 +61,7 @@
    ##是否启用分布式锁
    enabled: false
    ##redis服务地址
    address: redis://127.0.0.1:6378
    address: redis://127.0.0.1:6379
  #本地文件上传
  file:
    remote-mode: true