Commit 06cef7da authored by tangwei's avatar tangwei

修改bug

parent 92d91934
...@@ -245,10 +245,10 @@ ...@@ -245,10 +245,10 @@
Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance, Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance,
case when cks_d.count is null then 0 else cks_d.count end as keySiteNum case when cks_d.count is null then 0 else cks_d.count end as keySiteNum
FROM important_companys a left join ( FROM important_companys a left join (
SELECT cks.belong_id ,count(cks.belong_id) count from cb_key_site cks GROUP BY cks.belong_id SELECT cks.belong_id ,count(cks.belong_id) count from cb_key_site cks where cks.is_delete=0 GROUP BY cks.belong_id
)cks_d )cks_d
on a.id=cks_d.belong_id on a.id=cks_d.belong_id
where a.longitude is not null and a.latitude is not null where a.longitude is not null and a.latitude is not null
<if test='par.distance!=null'> <if test='par.distance!=null'>
and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;= and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
#{par.distance} #{par.distance}
......
...@@ -249,6 +249,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal ...@@ -249,6 +249,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
alertFormValuelist.stream().forEach(alertFormValue -> { alertFormValuelist.stream().forEach(alertFormValue -> {
if(alertFormValue.getFieldCode().equals("responseLevel")){ if(alertFormValue.getFieldCode().equals("responseLevel")){
alertCalled.setResponseLevelCode(alertFormValue.getFieldValueCode()); alertCalled.setResponseLevelCode(alertFormValue.getFieldValueCode());
alertCalled.setResponseLevel(alertFormValue.getFieldValue());
} }
}); });
} }
......
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