jczz_manager.git

			@@ -152,16 +152,36 @@
			jtrfr.lat,
			jtrfr.address,
			jtrfr.view_type,
			br.town_name streetName,
			jg.grid_name,
			jda.aoi_name,
			br.village_name communityName,
			jda.address_name as addressName
			from jczz_task_report_for_repairs jtrfr
			left join jczz_doorplate_address jda on jda.address_code = jtrfr.address_code
			left join jczz_grid_range jgr on jgr.house_code = jtrfr.address_code
			left join jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
			LEFT JOIN jczz_house jh on jh.house_code=jtrfr.address_code
			left join jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
			left join blade_region br on br.code = jg.community_code
			where jtrfr.is_deleted = 0
			<if test="vo.createUser != null and vo.createUser != ''">
			AND jtrfr.create_user = #{vo.createUser}
			</if>

			<if test="vo.streetName != null and vo.streetName != ''">
			AND br.town_name like concat('%',#{vo.streetName},'%')
			</if>
			<if test="vo.communityName != null and vo.communityName != ''">
			AND br.village_name like concat('%',#{vo.communityName},'%')
			</if>

			<if test="vo.gridName != null and vo.gridName != ''">
			AND jg.grid_name like concat('%',#{vo.gridName},'%')
			</if>

			<if test="vo.aoiName != null and vo.aoiName != ''">
			AND jda.aoi_name like concat('%',#{vo.aoiName},'%')
			</if>

			<if test="vo.type != null">
			AND jtrfr.type = #{vo.type}
			</if>
			@@ -208,8 +228,7 @@
			or jtrfr.confirm_user_id = #{vo.confirmUserId})
			</when>
			<otherwise>
			and (jda.address_code in ('')
			or jtrfr.confirm_user_id = #{vo.confirmUserId})
			and (jtrfr.confirm_user_id = #{vo.confirmUserId})
			</otherwise>
			</choose>
			</if>