辅助决策-绩效考核-搜索BUG修复

mybusiness/src/main/resources/mapper/zhsq_qk/fangjian/ZhsqFangjianMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.business.zhsq_qk.fangjian.mapper.ZhsqFangjianMapper">
-    
+
     <resultMap type="ZhsqFangjian" id="ZhsqFangjianResult">
         <result property="fjId"    column="fj_id"    />
         <result property="xqId"    column="xqId"    />
@@ -57,21 +57,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectZhsqFangjianList" parameterType="ZhsqFangjian" resultMap="ZhsqFangjianResult">
-        select fj_id, dy_id,
-        (select ld_id from zhsq_danyuan where dy_id = zhsq_fangjian.dy_id) ldId,
-        (select ld_name from zhsq_loudong where ld_id = ldId) ldName,
-        (select xq_id from zhsq_loudong where zhsq_loudong.ld_id = ldId) xqId,
-        (select xq_name from zhsq_xiaoqu where xq_id = xqId) xqName,
-        (select dy_name from zhsq_danyuan where dy_id = zhsq_fangjian.dy_id) dyName,
-        fj_name, fj_lc, jd_id, jd_name, sq_id, sq_name, wg_id, wg_name, zhsq_fangjian.del_flag, zhsq_fangjian.create_id, zhsq_fangjian.create_time, zhsq_fangjian.update_id, zhsq_fangjian.update_time,
-        fj_sfpf, fj_sfydxs, fj_sfzr, fj_sffw, fj_glfs, fj_wyh, fj_wfjz, fj_sfcw, fj_sfgz, fj_sfmsf, fj_shlx, fj_sfgkpy, fj_sfjhq, fj_sfslz, rfh_fjxz,
-        sys_user.user_name as createName
+<!--        select fj_id, dy_id,-->
+<!--        (select ld_id from zhsq_danyuan where dy_id = zhsq_fangjian.dy_id) ldId,-->
+<!--        (select ld_name from zhsq_loudong where ld_id = ldId) ldName,-->
+<!--        (select xq_id from zhsq_loudong where zhsq_loudong.ld_id = ldId) xqId,-->
+<!--        (select xq_name from zhsq_xiaoqu where xq_id = xqId) xqName,-->
+<!--        (select dy_name from zhsq_danyuan where dy_id = zhsq_fangjian.dy_id) dyName,-->
+<!--        fj_name, fj_lc, jd_id, jd_name, sq_id, sq_name, wg_id, wg_name, zhsq_fangjian.del_flag, zhsq_fangjian.create_id, zhsq_fangjian.create_time, zhsq_fangjian.update_id, zhsq_fangjian.update_time,-->
+<!--        fj_sfpf, fj_sfydxs, fj_sfzr, fj_sffw, fj_glfs, fj_wyh, fj_wfjz, fj_sfcw, fj_sfgz, fj_sfmsf, fj_shlx, fj_sfgkpy, fj_sfjhq, fj_sfslz, rfh_fjxz,-->
+<!--        sys_user.user_name as createName-->
+<!--        <if test="createId != null "> ,CASE WHEN zhsq_fangjian.create_id = #{createId} THEN TRUE ELSE FALSE END AS isOperable</if>-->
+<!--        from zhsq_fangjian-->
+<!--        LEFT JOIN sys_user ON sys_user.user_id = zhsq_fangjian.create_id-->
+<!--        where zhsq_fangjian.del_flag = '0'-->
+        SELECT
+        fj_id,
+        zhsq_fangjian.dy_id,
+        zhsq_danyuan.ld_id AS ldId,
+        zhsq_loudong.ld_name AS ldName,
+        zhsq_loudong.xq_id AS xqId,
+        zhsq_xiaoqu.xq_name AS xqName,
+        zhsq_danyuan.dy_name AS dyName,
+        fj_name,
+        fj_lc,
+        zhsq_fangjian.jd_id,
+        zhsq_fangjian.jd_name,
+        zhsq_fangjian.sq_id,
+        zhsq_fangjian.sq_name,
+        zhsq_fangjian.wg_id,
+        zhsq_fangjian.wg_name,
+        zhsq_fangjian.del_flag,
+        zhsq_fangjian.create_id,
+        zhsq_fangjian.create_time,
+        zhsq_fangjian.update_id,
+        zhsq_fangjian.update_time,
+        fj_sfpf,
+        fj_sfydxs,
+        fj_sfzr,
+        fj_sffw,
+        fj_glfs,
+        fj_wyh,
+        fj_wfjz,
+        fj_sfcw,
+        fj_sfgz,
+        fj_sfmsf,
+        fj_shlx,
+        fj_sfgkpy,
+        fj_sfjhq,
+        fj_sfslz,
+        rfh_fjxz,
+        sys_user.user_name AS createName
         <if test="createId != null "> ,CASE WHEN zhsq_fangjian.create_id = #{createId} THEN TRUE ELSE FALSE END AS isOperable</if>
-        from zhsq_fangjian
+        FROM
+        zhsq_fangjian
         LEFT JOIN sys_user ON sys_user.user_id = zhsq_fangjian.create_id
-        where zhsq_fangjian.del_flag = '0'
+        LEFT JOIN zhsq_danyuan ON zhsq_danyuan.dy_id = zhsq_fangjian.dy_id
+        LEFT JOIN zhsq_loudong ON zhsq_loudong.ld_id = zhsq_danyuan.ld_id
+        LEFT JOIN zhsq_xiaoqu ON zhsq_xiaoqu.xq_id = zhsq_loudong.xq_id
+        WHERE
+        zhsq_fangjian.del_flag = '0'
         <if test="exportIds != null  and exportIds != ''"> and fj_id in (${exportIds})</if>
-        <if test="dyId != null "> and dy_id = #{dyId}</if>
+<!--        <if test="dyId != null "> and dy_id = #{dyId}</if>-->
         <if test="fjName != null  and fjName != ''"> and fj_name like concat('%', #{fjName}, '%')</if>
         <if test="fjLc != null  and fjLc != ''"> and fj_lc = #{fjLc}</if>
         <if test="jdId != null "> and jd_id = #{jdId}</if>
@@ -97,12 +143,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="fjSfslz != null  and fjSfslz != ''"> and fj_sfslz = #{fjSfslz}</if>
         <if test="rfhFjxz != null  and rfhFjxz != ''"> and rfh_fjxz = #{rfhFjxz}</if>
     </select>
-    
+
     <select id="selectZhsqFangjianById" parameterType="Long" resultMap="ZhsqFangjianResult">
         <include refid="selectZhsqFangjianVo"/>
         where fj_id = #{fjId}
     </select>
-        
+
     <insert id="insertZhsqFangjian" parameterType="ZhsqFangjian">
         insert into zhsq_fangjian
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -261,4 +307,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND zhsq_loudong.del_flag = 0
         AND zhsq_loudong.ld_id = #{ldId}
     </select>
-</mapper>
+</mapper>