limeng 2 lat temu
rodzic
commit
e32ead99e2

+ 36 - 29
mybusiness/src/main/resources/mapper/zhsq_qk/ksh/ZhsqKshMapper.xml

@@ -28,41 +28,48 @@ dept_id jdId, dept_name jdName from sys_dept where post_id = 15 and parent_id =
     </select>
     <select id="kshFanghuTotal" parameterType="ZhsqKshVo" resultType="ZhsqKshTotal">
         SELECT
-            a1.jd_id,
-            IFNULL(a1.xiaoquCount, 0) AS xiaoquCount,
-            IFNULL(a2.loudongCount, 0) AS loudongCount,
-            IFNULL(a3.fangjianCount, 0) AS fangjianCount
+            sum(z.a) xiaoquCount,
+            sum(z.b) loudongCount,
+            sum(z.c) fangjianCount
         FROM
             (
                 SELECT
-                    COUNT(*) AS xiaoquCount,
-                    zhsq_xiaoqu.jd_id
+                    COUNT(xq_id) AS a,
+                    0 AS b,
+                    0 AS c,
+                    jd_id
                 FROM
                     zhsq_xiaoqu
                 WHERE
-                    zhsq_xiaoqu.del_flag = 0
-        <if test="jdId != null  and jdId != ''"> AND zhsq_xiaoqu.jd_id = #{jdId} </if>
-            ) a1
-        LEFT JOIN (
-            SELECT
-                COUNT(*) AS loudongCount,
-                zhsq_loudong.jd_id
-            FROM
-                zhsq_loudong
-            WHERE
-                zhsq_loudong.del_flag = 0
-        <if test="jdId != null  and jdId != ''"> AND zhsq_loudong.jd_id = #{jdId} </if>
-        ) a2 ON a1.jd_id = a2.jd_id
-        LEFT JOIN (
-            SELECT
-                COUNT(*) AS fangjianCount,
-                zhsq_fangjian.jd_id
-            FROM
-                zhsq_fangjian
-            WHERE
-                zhsq_fangjian.del_flag = 0
-        <if test="jdId != null  and jdId != ''"> AND zhsq_fangjian.jd_id = #{jdId} </if>
-        ) a3 ON a3.jd_id = a1.jd_id
+                    del_flag = 0
+                AND jd_id IS NOT NULL
+                <if test="jdId != null  and jdId != ''"> AND jd_id = #{jdId} </if>
+                UNION ALL
+                SELECT
+                    0 AS a,
+                    COUNT(ld_id) AS b,
+                    0 AS c,
+                    jd_id
+                FROM
+                    zhsq_loudong
+                WHERE
+                    del_flag = 0
+                AND jd_id IS NOT NULL
+                <if test="jdId != null  and jdId != ''"> AND jd_id = #{jdId} </if>
+                UNION ALL
+                SELECT
+                    0 AS a,
+                    0 AS b,
+                    COUNT(fj_id) AS c,
+                    jd_id
+                FROM
+                    zhsq_fangjian
+                WHERE
+                    del_flag = 0
+                AND jd_id IS NOT NULL
+
+                <if test="jdId != null  and jdId != ''"> AND jd_id = #{jdId} </if>
+            ) z
     </select>
     <select id="kshZhongdianrenkouTotal" parameterType="ZhsqKshVo" resultType="ZhsqKshTotal">
         SELECT

+ 1 - 1
mybusiness/src/main/resources/mapper/zhsq_qk/person/ZhsqPersonMapper.xml

@@ -383,7 +383,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (select xq_id from zhsq_loudong where zhsq_loudong.ld_id = ldId) xqId,
         (select xq_name from zhsq_xiaoqu where xq_id = xqId) xqName,
         zhsq_fangjian.fj_id as zhsq_fangjian_fj_id, dy_id, (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 as zhsq_fangjian_del_flag, zhsq_fangjian.create_id as zhsq_fangjian_create_id, zhsq_fangjian.create_time as zhsq_fangjian_create_time, zhsq_fangjian.update_id as zhsq_fangjian_update_id, zhsq_fangjian.update_time as zhsq_fangjian_update_time,
+        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 as zhsq_fangjian_del_flag, zhsq_fangjian.create_id as zhsq_fangjian_create_id, zhsq_fangjian.create_time as zhsq_fangjian_create_time, zhsq_fangjian.update_id as zhsq_fangjian_update_id, zhsq_fangjian.update_time as 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,
         canji_id, zhsq_per_canji.per_id aa, canji_cjz, canji_type, canji_bt, canji_sfxf, canji_xfpc,
         junren_id, zhsq_per_junren.per_id bb, junren_state, junren_sfyf, junren_yfzl,