修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/LinkageUnitMapper.xml

@@ -46,18 +46,25 @@
 		a.longitude,
 		Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
 		AS distance,
+
+		SUM(case when csps.person_number is null then 0 else
+		csps.person_number end) as userNum,
+		SUM(case when cre.vehicle_number is null then 0 else cre.vehicle_number end )as
+		carNum
+	<!--
     case when csps.person_number is null then 0 else
     csps.person_number end as userNum,
     case when cre.vehicle_number is null then 0 else cre.vehicle_number end as
-		carNum
+    carNum-->
+    
     FROM
     cb_linkage_unit a
     LEFT JOIN cb_special_position_staff csps ON a.sequence_nbr =
     csps.company_id
     LEFT JOIN cb_rescue_equipment cre on a.sequence_nbr = cre.company_id
 
-		where a.longitude is not null and
-		a.latitude is not null
+    where a.is_delete=0  and a.longitude is not null and
+    a.latitude is not null GROUP BY a.sequence_nbr
     <if test='par.distance!=null'>
         and
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
@@ -65,9 +72,9 @@
         #{par.distance}
     </if>
     ORDER BY distance limit #{pageNum},#{pageSize}
-	</select>
+</select>
 
-	<select id="listLinkageUnitZhDtoCount" resultType="Integer">
+<select id="listLinkageUnitZhDtoCount" resultType="Integer">
     select
     COUNT(a.sequence_nbr) num
     FROM cb_linkage_unit a
@@ -79,10 +86,10 @@
         &lt;=
         #{par.distance}
     </if>
-	</select>
+</select>
 
 
-	<select id="getEmergencyLinkageUnitCodeGroupByAndCount"
+<select id="getEmergencyLinkageUnitCodeGroupByAndCount"
     resultType="java.util.Map">
     SELECT
     emergency_linkage_unit_code as
@@ -94,9 +101,9 @@
     is_delete = 0
     GROUP BY
     emergency_linkage_unit_code
-	</select>
+</select>
 
-	<select id="exportToExcel"
+<select id="exportToExcel"
     resultType="com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto">
     select
     a.unit_name unitName,
@@ -128,9 +135,9 @@
 
     on
     b.instance_id=a.instance_id where a.unit_name is not null and a.is_delete=0
-	</select>
+</select>
 
-	<!--联动单位列表按时间倒叙排列add order by clu.rec_date desc 同时处理单位根节点-1时查询全部数据问题 2021-09-08 by kongfm -->
+<!--联动单位列表按时间倒叙排列add order by clu.rec_date desc 同时处理单位根节点-1时查询全部数据问题 2021-09-08 by kongfm -->
 	<select id="getEmergencyLinkageUnitList"
 		resultType="java.util.Map">
 		SELECT