jagzwxm/ja_manage.git

			@@ -44,7 +44,7 @@
			from
			ja_fw_device
			<where>
			is_deleted = 0
			is_deleted = 0
			<if test="param2.id != null and param2.id != ''">
			and id = #{param2.id}
			</if>
			@@ -92,10 +92,19 @@
			and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
			</if>
			<if test="param2.deptList != null and param2.deptList.size > 0">
			and create_dept in
			and ( create_dept in
			<foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
			#{deptId}
			</foreach>
			<!-- 或者设备是共享给当前部门的 -->
			<if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
			or id in (
			SELECT device_id FROM ja_fw_device_per_share
			WHERE loan_to_dept_id = #{param2.currentDeptId}
			AND is_deleted = 0
			)
			</if>
			)
			</if>
			</where>
			</select>
			@@ -104,68 +113,60 @@
			select * from ja_fw_device
			<where>
			is_deleted = 0
			<if test="isAreaSelect != null and isAreaSelect == 1">
			and (
			<choose>
			<when test="areaIds != null and areaIds.size > 0">
			<choose>
			<when test="areaIds != null and areaIds.size > 0">
			and (
			exists (
			select 1
			from ja_fw_area_divide ad
			where ad.is_deleted = 0
			and ad.id in
			<foreach collection="areaIds" item="areaIdItem" separator="," open="(" close=")">
			#{areaIdItem}
			</foreach>
			and ad.device_ids is not null
			and ad.device_ids != ''
			and find_in_set(ja_fw_device.id, ad.device_ids)
			select 1
			from ja_fw_area_divide ad
			where ad.is_deleted = 0
			and ad.id in
			<foreach collection="areaIds" item="areaIdItem" separator="," open="(" close=")">
			#{areaIdItem}
			</foreach>
			and ad.device_ids is not null
			and ad.device_ids != ''
			and find_in_set(ja_fw_device.id, ad.device_ids)
			)
			or not exists (
			select 1
			from ja_fw_area_divide ad
			where ad.is_deleted = 0
			and ad.device_ids is not null
			and ad.device_ids != ''
			and find_in_set(ja_fw_device.id, ad.device_ids)
			and ad.id not in
			<foreach collection="areaIds" item="areaIdItem" separator="," open="(" close=")">
			#{areaIdItem}
			</foreach>
			)
			</when>
			<when test="areaId != null">
			exists (
			select 1
			from ja_fw_area_divide ad
			where ad.is_deleted = 0
			and ad.id = #{areaId}
			and ad.device_ids is not null
			and ad.device_ids != ''
			and find_in_set(ja_fw_device.id, ad.device_ids)
			)
			</when>
			<when test="isAreaSelect != null and isAreaSelect == 1">
			and (
			<choose>
			<when test="areaId != null">
			exists (
			select 1
			from ja_fw_area_divide ad
			where ad.is_deleted = 0
			and ad.id = #{areaId}
			and ad.device_ids is not null
			and ad.device_ids != ''
			and find_in_set(ja_fw_device.id, ad.device_ids)
			)
			or not exists (
			select 1
			from ja_fw_area_divide ad
			where ad.is_deleted = 0
			and ad.device_ids is not null
			and ad.device_ids != ''
			and find_in_set(ja_fw_device.id, ad.device_ids)
			and ad.id != #{areaId}
			select 1
			from ja_fw_area_divide ad
			where ad.is_deleted = 0
			and ad.device_ids is not null
			and ad.device_ids != ''
			and find_in_set(ja_fw_device.id, ad.device_ids)
			and ad.id != #{areaId}
			)
			</when>
			<otherwise>
			not exists (
			select 1
			from ja_fw_area_divide ad
			where ad.is_deleted = 0
			and ad.device_ids is not null
			and ad.device_ids != ''
			and find_in_set(ja_fw_device.id, ad.device_ids)
			select 1
			from ja_fw_area_divide ad
			where ad.is_deleted = 0
			and ad.device_ids is not null
			and ad.device_ids != ''
			and find_in_set(ja_fw_device.id, ad.device_ids)
			)
			</otherwise>
			</choose>
			)
			</if>
			)
			</when>
			</choose>
			<if test="status != null">
			and status = #{status}
			</if>
			@@ -341,13 +342,13 @@
			<foreach collection="deptList" item="deptId" open="(" separator="," close=")">
			#{deptId}
			</foreach>
			<!-- <if test="currentDeptId != null and currentDeptId != '' "> -->
			<!-- or a.id in ( -->
			<!-- SELECT device_id FROM ja_fw_device_per_share -->
			<!-- WHERE loan_to_dept_id = #{currentDeptId} -->
			<!-- AND is_deleted = 0 -->
			<!-- ) -->
			<!-- </if> -->
			<if test="currentDeptId != null and currentDeptId != '' ">
			or a.id in (
			SELECT device_id FROM ja_fw_device_per_share
			WHERE loan_to_dept_id = #{currentDeptId}
			AND is_deleted = 0
			)
			</if>
			)
			</if>
			group by a.device_type,b.dict_value
			@@ -395,10 +396,18 @@
			WHERE
			is_deleted = 0
			<if test="deptList != null and deptList.size > 0">
			and create_dept in
			and ( create_dept in
			<foreach collection="deptList" item="deptId" open="(" separator="," close=")">
			#{deptId}
			</foreach>
			<if test="currentDeptId != null and currentDeptId != '' ">
			or id in (
			SELECT device_id FROM ja_fw_device_per_share
			WHERE loan_to_dept_id = #{currentDeptId}
			AND is_deleted = 0
			)
			</if>
			)
			</if>
			GROUP BY
			manufacturer
			@@ -515,12 +524,23 @@

			<select id="selectCockpitDevicePage" resultType="org.sxkj.fw.device.vo.CockpitFwDeviceVO">
			select
			d.*
			d.*,
			min(ad.id) as area_divide_id,
			min(dsm.id) as defense_scene_manage_id
			from
			ja_fw_device d
			left join ja_fw_area_divide ad
			on find_in_set(d.id, ad.device_ids) > 0
			and ad.is_deleted = 0
			left join ja_fw_defense_scene ds
			on find_in_set(ad.id, ds.area_divide_ids) > 0
			and ds.is_deleted = 0
			left join ja_fw_defense_scene_manage dsm
			on dsm.defense_scene_id = ds.id
			and dsm.is_deleted = 0
			<where>
			d.is_deleted = 0
			and d.is_enabled = 1
			d.is_deleted = 0
			and d.is_enabled = 1
			<if test="param2.regionCode != null and param2.regionCode != ''">
			and (d.final_outbound_area_code like concat(#{param2.regionCode},'%')
			<!-- 或者设备是共享给当前部门的 -->
			@@ -579,6 +599,7 @@
			</foreach>
			</if>
			</where>
			group by d.id
			</select>

			<update id="updateTrackStatusByDeviceId">