实操成绩导入逻辑修改

guoshilong

2023-12-19 8d2895b7831497255f18a4fea10762791b5b6c13

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

@@ -394,19 +394,26 @@
    </select>

    <select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
        SELECT id,
               tenant_id,
               user_type,
               account,
               name,
               real_name,
               email,
               phone,
               birthday,
               role_id,
               dept_id,
               post_id
        FROM blade_user ${ew.customSqlSegment}
            SELECT
                bu.id,
                bd.dept_name AS deptId,
                bu.real_name,
                bu.phone,
                bu.sex,
                bu.cardid
            FROM
                blade_user bu
                    LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
                where bu.is_deleted = 0
                <if test="obj.account != null and obj.account != ''">
                    AND bu.account LIKE CONCAT('%',#{obj.account},'%')
                </if>
                <if test="obj.realName != null and obj.realName != ''">
                    AND bu.real_name LIKE CONCAT('%',#{obj.realName},'%')
                </if>
                <if test="obj.deptId != null and obj.deptId != ''">
                    AND bu.dept_id = #{obj.deptId}
                </if>
    </select>

    <!--通过 身份证号查询用户信息-->
@@ -984,16 +991,17 @@
        (id,
        tenant_id,account,password,name,real_name,avatar,email,phone,sex,
        role_id,dept_id,cardid,nativePlace,nation,fingerprint,education,
        politicaloutlook,healstats,height,address,registered,securitynumber,
        hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time,unit_name
        politicaloutlook,healstats,height,securitynumber,
        hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time
        )
        values
        <foreach collection="list" item="user" separator=",">
            (#{user.id},
            (
            #{user.id},
            #{user.tenantId},#{user.account},#{user.password},#{user.name},#{user.realName},#{user.avatar},#{user.email},#{user.phone},#{user.sex},
            #{user.roleId},#{user.deptId},#{user.cardid},#{user.nativeplace},#{user.nation},#{user.fingerprint},#{user.education},
            #{user.politicaloutlook},#{user.healstats},#{user.height},#{user.address},#{user.registered},#{user.securitynumber},
            #{user.hold},#{user.jurisdiction},#{user.examinationType},#{user.status},#{user.isDeleted},#{user.dispatch},#{user.createTime},#{user.unitName}
            #{user.politicaloutlook},#{user.healstats},#{user.height},#{user.securitynumber},
            #{user.hold},#{user.jurisdiction},#{user.examinationType},#{user.status},#{user.isDeleted},#{user.dispatch},#{user.createTime}
            )
        </foreach>
    </insert>
@@ -1146,6 +1154,12 @@
        and bu.role_id = '1412226235153731586'
        and bud.id is null
    </select>
    <select id="getUserInfoDetail" resultType="org.springblade.modules.system.vo.UserInfoDetail">
        SELECT * FROM BLADE_USER bu
        LEFT JOIN BLADE_USER_DETAIL BUD on bud.user_id = bu.id and bud.is_deleted = 0
        WHERE bu.is_deleted = 0 and bu.id = #{id}

    </select>


</mapper>