reportStatus

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

@@ -54,7 +54,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
                     "from ms_report a \n" +
                     "INNER JOIN sys_uptown_house b ON a.house_id = b.house_id\n" +
                     "INNER JOIN sys_uptown_unit c ON c.unit_id = b.unit_id and c.uptown_id = #{uptownId}\n" +
-                    "where a.report_date = #{date} and a.ms_status = 2"
+                    "where a.report_date = #{date} and a.ms_status = 2 and a.report_status = 1"
     )
     Map<String, Integer> selectyicahng(@Param("uptownId") Long uptownId, @Param("date") String date);
 
@@ -64,7 +64,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
                     "from ms_report a \n" +
                     "INNER JOIN sys_uptown_house b ON a.house_id = b.house_id\n" +
                     "INNER JOIN sys_uptown_unit c ON c.unit_id = b.unit_id and c.uptown_id = #{uptownId}\n" +
-                    "where a.report_date = #{date}"
+                    "where a.report_date = #{date} and a.report_status = 1"
     )
     Map<String, Integer> selecthuiz(@Param("uptownId") Long uptownId, @Param("date") String date);