[task-1704] 【设施】设施环境模块改进 / 【后端】设施环境总览接口

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/service/impl/FacilityEnvironmentServiceImpl.java

@@ -32,10 +32,10 @@ public class FacilityEnvironmentServiceImpl implements FacilityEnvironmentServic
             buMen = result1.getData().stream().map(n -> n.getId()).collect(Collectors.joining(","));
 
         }
-        String fetchSql =  "SELECT facs_type,pos.name_,COUNT(shi_fou_guo_shen_='待处理'  OR NULL ) AS todo,COUNT(shi_fou_guo_shen_='已完成'  OR NULL) AS done " +
-                "   FROM v_facs_summary_daily facs, ibps_party_position pos " +
-                "   WHERE FIND_IN_SET(bian_zhi_bu_men_,'%s') AND facs.bian_zhi_bu_men_=pos.id_ " +
-                "   GROUP BY facs_type,bian_zhi_bu_men_ ORDER BY facs_type";
+        String fetchSql =  "SELECT facs_type,pos.name_,COUNT(shi_fou_guo_shen_='待处理'  OR NULL ) AS todo,COUNT(shi_fou_guo_shen_='已完成'  OR NULL) AS done ,MAX(facs.pagePath) AS pagePath" +
+                "   FROM v_facs_summary_daily, ibps_party_position pos,(SELECT DISTINCT pagePath,`type` FROM v_facs WHERE pagePath <>'') facs" +
+                "   WHERE FIND_IN_SET(bian_zhi_bu_men_,'%s') AND bian_zhi_bu_men_=pos.id_ AND facs_type = facs.type" +
+                "   GROUP BY facs_type,bian_zhi_bu_men_ ORDER BY facs_type;";
         return (List<Map<String, Object>>)commonDao.query(String.format(fetchSql,buMen));
     }
 }