zgyw.git - Gitblit

			@@ -182,6 +182,18 @@
			#{deptId}
			</foreach>
			</if>
			<if test="provinceTag!=null">
			and p.province_tag = #{provinceTag}
			</if>
			<if test="importantTag!=null">
			and p.important_tag = #{importantTag}
			</if>
			<if test="importantCommandImageTag!=null">
			and p.important_command_image_tag = #{importantCommandImageTag}
			</if>
			<if test="deptTag!=null">
			and p.dept_tag =#{deptTag}
			</if>
			</where>
			</select>
			<select id="selectTMonitorById" parameterType="Long" resultType="com.ycl.platform.domain.vo.TMonitorVO">
			@@ -461,8 +473,8 @@
			sys_dept d
			LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 1 </if><if test="dataScope == 3"> AND p.important_tag = 1 </if>
			LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 AND p.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if>
			LEFT JOIN t_monitor m ON m.serial_number = p.serial_number AND INSTR(m.camera_fun_type, 1)
			LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 1)
			LEFT JOIN t_monitor m ON m.serial_number = p.serial_number AND INSTR(m.camera_fun_type, 3)
			LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 3)
			WHERE d.del_flag = 0 AND d.area IS NOT NULL
			GROUP BY d.area, d.dept_id
			ORDER BY d.area_code
			@@ -497,8 +509,8 @@
			sys_dept d
			LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 1 </if><if test="dataScope == 3"> AND p.important_tag = 1 </if>
			LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 AND p.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if>
			LEFT JOIN t_monitor m ON m.serial_number = p.serial_number AND INSTR(m.camera_fun_type, 3)
			LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 3)
			LEFT JOIN t_monitor m ON m.serial_number = p.serial_number AND INSTR(m.camera_fun_type, 1)
			LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 1)
			WHERE d.del_flag = 0 AND d.area IS NOT NULL
			GROUP BY d.area, d.area_code, d.dept_id
			ORDER BY d.area_code