jczz_manager.git

			@@ -37,6 +37,9 @@
			<if test="gridWorkLog.name !=null and gridWorkLog.name!=''">
			and jh.name like concat('%',#{gridWorkLog.name},'%')
			</if>
			<if test="gridWorkLog.houseCode !=null and gridWorkLog.houseCode!=''">
			and jh.house_code = #{gridWorkLog.houseCode}
			</if>
			<if test="gridWorkLog.phone !=null and gridWorkLog.phone!=''">
			and jh.phone_number like concat('%',#{gridWorkLog.phone},'%')
			</if>
			@@ -46,8 +49,18 @@
			<if test="gridWorkLog.neiName!=null and gridWorkLog.neiName!=''">
			and jda.nei_name like concat('%',#{gridWorkLog.neiName},'%')
			</if>
			<if test="gridWorkLog.regionCode!=null and gridWorkLog.regionCode!=''">
			and jg.community_code like concat('%',#{gridWorkLog.regionCode},'%')
			<if test="isAdministrator==2">
			<choose>
			<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
			and jg.community_code in
			<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			</when>
			<otherwise>
			and jg.community_code in ('')
			</otherwise>
			</choose>
			</if>
			</select>

			@@ -55,13 +68,13 @@
			<select id="getGridWorkCountHandleCount" resultType="java.lang.Integer">
			select count(*) from jczz_grid_work_log jgwl
			left join jczz_household jh on jgwl.household_id = jh.id and jh.is_deleted = 0
			left join jczz_grid_range jgr on jgr.house_code=jh.house_code
			left join jczz_house jhs on jhs.house_code=jh.house_code
			where jgwl.is_deleted = 0
			<if test="status!=null">
			and jgwl.status = #{status}
			</if>
			<if test="gridId!=null">
			and jgr.grid_id = #{gridId}
			<if test="gridCode!=null and gridCode!=''">
			and jhs.grid_code = #{gridCode}
			</if>
			</select>