Merge remote-tracking branch 'origin/developer' into developer

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

@@ -46,91 +46,98 @@
 		a.longitude,
 		Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
 		AS distance,
-		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
+
+		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
-		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
+	<!--
+    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-->
+    
+    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
-		<if test='par.distance!=null'>
-			and
-			Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
-			&lt;=
-			#{par.distance}
-		</if>
-		ORDER BY distance limit #{pageNum},#{pageSize}
-	</select>
+    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)
+        &lt;=
+        #{par.distance}
+    </if>
+    ORDER BY distance limit #{pageNum},#{pageSize}
+</select>
 
-	<select id="listLinkageUnitZhDtoCount" resultType="Integer">
-		select
-		COUNT(a.sequence_nbr) num
-		FROM cb_linkage_unit a
-		where a.longitude
-		is not null and a.latitude is not null
-		<if test='par.distance!=null'>
-			and
-			Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
-			&lt;=
-			#{par.distance}
-		</if>
-	</select>
+<select id="listLinkageUnitZhDtoCount" resultType="Integer">
+    select
+    COUNT(a.sequence_nbr) num
+    FROM cb_linkage_unit a
+    where a.longitude
+    is not null and a.latitude is not null
+    <if test='par.distance!=null'>
+        and
+        Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
+        &lt;=
+        #{par.distance}
+    </if>
+</select>
 
 
-	<select id="getEmergencyLinkageUnitCodeGroupByAndCount"
-		resultType="java.util.Map">
-		SELECT
-		emergency_linkage_unit_code as
-		emergencyLinkageUnitCode,
-		COUNT(unit_code) AS count
-		FROM
-		cb_linkage_unit
-		WHERE
-		is_delete = 0
-		GROUP BY
-		emergency_linkage_unit_code
-	</select>
+<select id="getEmergencyLinkageUnitCodeGroupByAndCount"
+    resultType="java.util.Map">
+    SELECT
+    emergency_linkage_unit_code as
+    emergencyLinkageUnitCode,
+    COUNT(unit_code) AS count
+    FROM
+    cb_linkage_unit
+    WHERE
+    is_delete = 0
+    GROUP BY
+    emergency_linkage_unit_code
+</select>
 
-	<select id="exportToExcel"
-		resultType="com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto">
-		select
-		a.unit_name unitName,
-		a.linkage_unit_type
-		linkageUnitType,
-		a.address ,
-		a.latitude,
-		a.longitude,
-		a.agreement_start_date agreementStartDate,
-		a.agreement_end_date
-		agreementEndDate,
-		a.contact_user contactUser,
-		a.contact_phone
-		contactPhone,
-		b.*
-		from cb_linkage_unit a LEFT JOIN
-		(SELECT
-		m.instance_id,
-		max(case m.field_code when 'emergencyServiceContent' then
-		m.field_value end) emergencyServiceContent,
-		max(case m.field_code when
-		'fireRescueCapability' then m.field_value end) fireRescueCapability,
-		max(case m.field_code when 'responsibilitiesSituation' then
-		m.field_value end) responsibilitiesSituation,
-		max(case m.field_code
-		when 'unitSituation' then m.field_value end) unitSituation
-		FROM
-		cb_dynamic_form_instance m GROUP BY m.instance_id) b
+<select id="exportToExcel"
+    resultType="com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto">
+    select
+    a.unit_name unitName,
+    a.linkage_unit_type
+    linkageUnitType,
+    a.address ,
+    a.latitude,
+    a.longitude,
+    a.agreement_start_date agreementStartDate,
+    a.agreement_end_date
+    agreementEndDate,
+    a.contact_user contactUser,
+    a.contact_phone
+    contactPhone,
+    b.*
+    from cb_linkage_unit a LEFT JOIN
+    (SELECT
+    m.instance_id,
+    max(case m.field_code when 'emergencyServiceContent' then
+    m.field_value end) emergencyServiceContent,
+    max(case m.field_code when
+    'fireRescueCapability' then m.field_value end) fireRescueCapability,
+    max(case m.field_code when 'responsibilitiesSituation' then
+    m.field_value end) responsibilitiesSituation,
+    max(case m.field_code
+    when 'unitSituation' then m.field_value end) unitSituation
+    FROM
+    cb_dynamic_form_instance m GROUP BY m.instance_id) b
 
-		on
-		b.instance_id=a.instance_id where a.unit_name is not null and a.is_delete=0
-	</select>
+    on
+    b.instance_id=a.instance_id where a.unit_name is not null and a.is_delete=0
+</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