Commit 44f5f2f9 authored by tangwei's avatar tangwei

修改bug

parent b8a109d1
......@@ -47,10 +47,10 @@
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
(select SUM(csps.person_number) from cb_special_position_staff csps where a.sequence_nbr = csps.company_id and csps.is_delete=0 ) as userNum,
(select SUM(cre.vehicle_number) from cb_rescue_equipment cre where a.sequence_nbr = cre.company_id and cre.is_delete=0 ) as carNum
<!--
case when csps.person_number is null then 0 else
csps.person_number end as userNum,
......@@ -59,12 +59,12 @@
FROM
cb_linkage_unit a
LEFT JOIN cb_special_position_staff csps ON a.sequence_nbr =
<!-- 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
LEFT JOIN cb_rescue_equipment cre on a.sequence_nbr = cre.company_id-->
where a.is_delete=0 and a.longitude is not null and
a.latitude is not null GROUP BY a.sequence_nbr
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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment