xiugai

whepi-web/src/main/java/com/bofeng/dao/RbMapper.java

@@ -60,7 +60,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     Map<String, Integer> selectyicahng(@Param("uptownId") Long uptownId, @Param("date") String date);
 
     @Select(
-            "select sum(a.safety_num) AS safetyNum, sum(suspected_num) as suspectedNum\n" +
+            "select sum(suspected_num) as suspectedNum\n" +
                     ", count(a.report_id) as reportCount\n" +
                     "from ms_report a \n" +
                     "INNER JOIN sys_uptown_house b ON a.house_id = b.house_id\n" +
@@ -70,6 +70,16 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     Map<String, Integer> selecthuiz(@Param("uptownId") Long uptownId, @Param("date") String date);
 
     @Select(
+            "select count(0) AS safetyNum,\n" +
+                    "from sys_uptown_house suh\n" +
+                    "inner join sys_uptown_home suho on suho.house_id=suh.house_id\n" +
+                    "INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id = #{uptownId}\n" +
+                    "left join ms_report msr on msr.house_id = suh.house_id and msr.report_date = #{date}\n" +
+                    "left join ms_suspected mss on mss.report_id=msr.report_id"
+    )
+    Map<String, Integer> selecthuizong(@Param("uptownId") Long uptownId, @Param("date") String date);
+
+    @Select(
             "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, \n" +
                     "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum, \n" +
                     "msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,\n" +

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -203,6 +203,7 @@ public class YeWeiHuiController {
       Map<String, Integer> map1 = rbMapper.selecthuiz(upId, reportDate);
       Map<String, Integer> map2 = rbMapper.selectyicahng(upId, reportDate);
       Map<String, Integer> map3 = rbMapper.selecthuiz1(upId);
+      Map<String, Integer> map4 = rbMapper.selecthuizong(upId, reportDate);
 
       Map<String, Object> reMap = Maps.newHashMap();
       reMap.put("uptownName", uptowns.get(0).getUptownName());
@@ -210,7 +211,7 @@ public class YeWeiHuiController {
       nums.add(Conv.NI(map3.get("houseCount")));
       nums.add(Conv.NI(map1.get("reportCount")));
       nums.add(Conv.NI(map2.get("yichangCount")));
-      nums.add(Conv.NI(map1.get("safetyNum")));
+      nums.add(Conv.NI(map4.get("safetyNum")));
       nums.add(Conv.NI(map1.get("suspectedNum")));
       reMap.put("nums", nums);
       return Model.newSuccess(reMap);