jczz_manager.git

			@@ -406,98 +406,142 @@
			FROM
			jczz_house jh
			LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
			WHERE
			jda.nei_code = #{code}
			AND jh.is_deleted = 0
			<if test="buildingCode != null and buildingCode != ''">
			and jda.building_code=#{buildingCode}
			</if>
			<where>
			<if test="communityCodeList != null and communityCodeList.size()>0">
			jda.nei_code in
			<foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			</if>
			AND jh.is_deleted = 0
			<if test="buildingCode != null and buildingCode != ''">
			and jda.building_code=#{buildingCode}
			</if>

			<if test="unitCode != null and unitCode != ''">
			and jda.unit_code=#{unitCode}
			</if>
			<if test="unitCode != null and unitCode != ''">
			and jda.unit_code=#{unitCode}
			</if>

			<if test="aoiCode != null and aoiCode != ''">
			and jda.aoi_code=#{aoiCode}
			</if>
			<if test="userId != null and roleType == '1'">
			AND jda.address_code IN (
			SELECT DISTINCT
			jgr.house_code
			FROM
			jczz_grid jg
			LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
			WHERE
			jgm.user_id = #{userId}
			AND jg.is_deleted = 0
			)
			</if>
			<if test="userId != null and roleType == '3'">
			AND jda.address_code IN (SELECT
			jda.address_code
			FROM
			jczz_doorplate_address jda
			LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
			WHERE
			jc.res_police_user_id like concat('%',#{userId},'%'))
			)
			</if>
			) a
			<if test="aoiCode != null and aoiCode != ''">
			and jda.aoi_code=#{aoiCode}
			</if>
			<if test="userId != null and roleType == '1'">
			AND jda.address_code IN (
			SELECT DISTINCT
			jgr.house_code
			FROM
			jczz_grid jg
			LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
			WHERE
			jgm.user_id = #{userId}
			AND jg.is_deleted = 0
			)
			</if>
			<if test="userId != null and roleType == '3'">
			AND jda.address_code IN (SELECT
			jda.address_code
			FROM
			jczz_doorplate_address jda
			LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
			WHERE
			jc.res_police_user_id like concat('%',#{userId},'%'))
			)
			</if>
			) a
			</where>


			</select>


			<select id="getHouseStatisticsTwo" resultType="java.lang.Integer">
			SELECT
			count( 1 )
			count(*)
			FROM
			(
			SELECT DISTINCT
			jda.address_code
			FROM
			jczz_house jh
			LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
			WHERE
			jda.nei_code = #{code}
			AND jh.is_deleted = 0
			and jda.doorplate_type = '户室牌'
			<if test="buildingCode != null and buildingCode != ''">
			and jda.building_code=#{buildingCode}
			</if>

			<if test="unitCode != null and unitCode != ''">
			and jda.unit_code=#{unitCode}
			AND jda.unit_code is not null
			</if>

			<if test="aoiCode != null and aoiCode != ''">
			and jda.aoi_code=#{aoiCode}
			</if>
			<if test="userId != null and roleType == '1'">
			AND jda.address_code IN (
			SELECT DISTINCT
			jgr.house_code
			FROM
			jczz_grid jg
			LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
			WHERE
			jgm.user_id = #{userId}
			AND jg.is_deleted = 0
			)
			</if>
			<if test="userId != null and roleType == '3'">
			AND jda.address_code IN (SELECT
			jda.address_code
			FROM
			jczz_doorplate_address jda
			LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
			WHERE
			jc.res_police_user_id like concat('%',#{userId},'%'))
			)
			</if>
			) a
			jczz_doorplate_address jda
			LEFT JOIN jczz_house jh ON jda.address_code = jh.house_code AND jh.is_deleted = 0
			LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
			LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
			<where>
			<if test="communityCodeList != null and communityCodeList.size()>0">
			jda.nei_code in
			<foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			</if>
			and jda.doorplate_type = '户室牌'
			<choose>
			<when test="(buildingCode != null and buildingCode != '') or
			(unitCode != null and unitCode != '') or (aoiCode != null and aoiCode != '')">
			<if test="buildingCode != null and buildingCode != ''">
			and jda.building_code=#{buildingCode}
			</if>
			<if test="unitCode != null and unitCode != ''">
			and jda.unit_code=#{unitCode}
			AND jda.unit_code is not null
			</if>
			<if test="aoiCode != null and aoiCode != ''">
			and jda.aoi_code=#{aoiCode}
			</if>
			</when>
			<otherwise>
			<if test="isAdministrator==2">
			<choose>
			<when test="house.roleName != null and house.roleName != ''">
			<if test="house.roleName=='wgy'">
			<choose>
			<when test="gridCodeList !=null and gridCodeList.size()>0">
			and jh.grid_code in
			<foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			</when>
			<otherwise>
			and jh.grid_code in ('')
			</otherwise>
			</choose>
			</if>
			<if test="house.roleName=='mj'">
			<choose>
			<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
			and jpag.community_code in
			<foreach collection="regionChildCodesList" item="code" open="(" close=")"
			separator=",">
			#{code}
			</foreach>
			</when>
			<otherwise>
			and jpag.community_code in ('')
			</otherwise>
			</choose>
			</if>
			</when>
			<otherwise>
			<choose>
			<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
			and ( jg.grid_code in
			<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			or
			jpag.community_code in
			<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			)
			</when>
			<otherwise>
			and
			( jg.grid_code in ('') or jpag.community_code in ('') )
			</otherwise>
			</choose>
			</otherwise>
			</choose>
			</if>
			</otherwise>
			</choose>
			</where>

			</select>

			@@ -508,45 +552,49 @@
			FROM
			jczz_household jhh
			LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jhh.house_code
			WHERE
			jda.nei_code = #{code}
			AND jhh.is_deleted = 0
			and jda.doorplate_type = '户室牌'
			<if test="buildingCode != null and buildingCode != ''">
			and jda.building_code=#{buildingCode}
			</if>
			<where>
			jda.nei_code in
			<foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			AND jhh.is_deleted = 0
			and jda.doorplate_type = '户室牌'
			<if test="buildingCode != null and buildingCode != ''">
			and jda.building_code=#{buildingCode}
			</if>

			<if test="unitCode != null and unitCode != ''">
			and jda.unit_code=#{unitCode}
			AND jda.unit_code is not null
			</if>
			<if test="unitCode != null and unitCode != ''">
			and jda.unit_code=#{unitCode}
			AND jda.unit_code is not null
			</if>

			<if test="aoiCode != null and aoiCode != ''">
			and jda.aoi_code=#{aoiCode}
			</if>
			<if test="userId != null and roleType == '1'">
			AND jda.address_code IN (
			SELECT DISTINCT
			jgr.house_code
			FROM
			jczz_grid jg
			LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
			WHERE
			jgm.user_id = #{userId}
			AND jg.is_deleted = 0
			)
			</if>
			<if test="userId != null and roleType == '3'">
			AND jda.address_code IN (SELECT
			jda.address_code
			FROM
			jczz_doorplate_address jda
			LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
			WHERE
			jc.res_police_user_id like concat('%',#{userId},'%'))
			)
			</if>
			<if test="aoiCode != null and aoiCode != ''">
			and jda.aoi_code=#{aoiCode}
			</if>
			<if test="userId != null and roleType == '1'">
			AND jda.address_code IN (
			SELECT DISTINCT
			jgr.house_code
			FROM
			jczz_grid jg
			LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
			WHERE
			jgm.user_id = #{userId}
			AND jg.is_deleted = 0
			)
			</if>
			<if test="userId != null and roleType == '3'">
			AND jda.address_code IN (SELECT
			jda.address_code
			FROM
			jczz_doorplate_address jda
			LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
			WHERE
			jc.res_police_user_id like concat('%',#{userId},'%'))
			)
			</if>
			</where>
			</select>


			@@ -560,47 +608,49 @@
			FROM
			jczz_house jh
			LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
			WHERE
			jda.nei_code = #{code}
			AND jh.is_deleted = 0
			AND jda.unit_code is not null
			<if test="buildingCode != null and buildingCode != ''">
			and jda.building_code=#{buildingCode}
			</if>
			<where>
			jda.nei_code in
			<foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			AND jh.is_deleted = 0
			AND jda.unit_code is not null
			<if test="buildingCode != null and buildingCode != ''">
			and jda.building_code=#{buildingCode}
			</if>

			<if test="unitCode != null and unitCode != ''">
			and jda.unit_code=#{unitCode}
			</if>
			<if test="unitCode != null and unitCode != ''">
			and jda.unit_code=#{unitCode}
			</if>

			<if test="aoiCode != null and aoiCode != ''">
			and jda.aoi_code=#{aoiCode}
			</if>
			<if test="userId != null and roleType == '1'">
			AND jda.address_code IN (
			SELECT DISTINCT
			jgr.house_code
			FROM
			jczz_grid jg
			LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
			WHERE
			jgm.user_id = #{userId}
			AND jg.is_deleted = 0
			)
			</if>
			<if test="userId != null and roleType == '3'">
			AND jda.address_code IN (SELECT
			jda.address_code
			FROM
			jczz_doorplate_address jda
			LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
			WHERE
			jc.res_police_user_id like concat('%',#{userId},'%'))
			)
			</if>
			) a


			<if test="aoiCode != null and aoiCode != ''">
			and jda.aoi_code=#{aoiCode}
			</if>
			<if test="userId != null and roleType == '1'">
			AND jda.address_code IN (
			SELECT DISTINCT
			jgr.house_code
			FROM
			jczz_grid jg
			LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
			LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
			WHERE
			jgm.user_id = #{userId}
			AND jg.is_deleted = 0
			)
			</if>
			<if test="userId != null and roleType == '3'">
			AND jda.address_code IN (SELECT
			jda.address_code
			FROM
			jczz_doorplate_address jda
			LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
			WHERE
			jc.res_police_user_id like concat('%',#{userId},'%'))
			)
			</if>
			) a
			</where>
			</select>

			<select id="getHouseBuilding" resultType="java.lang.String">
			@@ -796,12 +846,19 @@

			<!--查询未绑定网格或警格的数据-->
			<select id="getNotBindGridOrJwGridList" resultType="org.springblade.modules.house.entity.HouseEntity">
			select id,lng,lat from jczz_house where is_deleted = 0 and lng != ''
			SELECT
			jh.id,
			IFNULL(jh.lng,jda.x) lng,
			IFNULL(jh.lat,jda.y) lat
			FROM
			jczz_house jh INNER JOIN jczz_doorplate_address jda on jda.address_code=jh.house_code
			WHERE
			jh.is_deleted = 0
			<if test="type == 1">
			and grid_code is null
			and jh.grid_code is null
			</if>
			<if test="type == 2">
			and jw_grid_code is null
			and jh.jw_grid_code is null
			</if>
			</select>

			@@ -824,67 +881,11 @@
			LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
			LEFT JOIN jczz_user_house_label juhl ON juhl.house_code = jh.house_code and juhl.lable_type = 2
			where jda.doorplate_type = '户室牌'
			<if test="house.communityCode != null and house.communityCode != ''">
			and jg.community_code = #{house.communityCode}
			</if>
			<if test="isAdministrator==2">
			<choose>
			<when test="house.roleName != null and house.roleName != ''">
			<if test="house.roleName=='wgy'">
			<choose>
			<when test="gridCodeList !=null and gridCodeList.size()>0">
			and jh.grid_code in
			<foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			</when>
			<otherwise>
			and jh.grid_code in ('')
			</otherwise>
			</choose>
			</if>
			<if test="house.roleName=='mj'">
			<choose>
			<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
			and jpag.community_code in
			<foreach collection="regionChildCodesList" item="code" open="(" close=")"
			separator=",">
			#{code}
			</foreach>
			</when>
			<otherwise>
			and jpag.community_code in ('')
			</otherwise>
			</choose>
			</if>
			</when>
			<otherwise>
			<choose>
			<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
			and
			(
			jg.grid_code in
			<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			or
			jpag.community_code in
			<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			)
			</when>
			<otherwise>
			and
			(
			jg.grid_code in ('')
			or
			jpag.community_code in ('')
			)
			</otherwise>
			</choose>
			</otherwise>
			</choose>
			<if test="communityCodeList !=null and communityCodeList.size()>0">
			and jda.nei_code in
			<foreach collection="communityCodeList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			</if>
			group by juhl.label_name
			) b on a.label_name =b.labelName
			@@ -965,16 +966,37 @@
			select house_code from jczz_household where is_deleted = 0 and relationship = 1 and house_code is not null and house_code != '' GROUP BY house_code
			) a on a.house_code = jh.house_code
			left join
			(
			select house_code from jczz_household where is_deleted = 0 and relationship = 18 and house_code is not null and house_code != '' GROUP BY house_code
			) b on b.house_code = jh.house_code
			(select house_code
			from jczz_household
			where is_deleted = 0
			and relationship = 18
			and house_code is not null
			and house_code != ''
			GROUP BY house_code) b on b.house_code = jh.house_code
			left join
			(
			select house_code from jczz_household where is_deleted = 0 and relationship is null or (relationship!=1 and relationship!=18) and house_code is not null and house_code != '' GROUP BY house_code
			) c on c.house_code = jh.house_code
			) d left join jczz_user_house_label juhl on d.house_code = juhl.house_code and lable_type = 2
			where juhl.id is null and status is not null
			limit #{i},#{size}
			(select house_code
			from jczz_household
			where is_deleted = 0 and relationship is null
			or (relationship!=1 and relationship!=18) and house_code is not null and house_code != ''
			GROUP BY house_code) c on c.house_code = jh.house_code) d
			left join jczz_user_house_label juhl on d.house_code = juhl.house_code and lable_type = 2
			where juhl.id is null
			and status is not null
			limit #{i}
			, #{size}
			</select>
			<select id="getHoseTotalAndAreaTotalByDistrictCode" resultType="java.util.Map">

			SELECT
			count( 1 ) AS houseCount,
			IFNULL(sum( area ),0) AS houseArea
			FROM
			jczz_house jh
			WHERE
			jh.district_code in
			<foreach collection="aoiCodeList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			</select>