优化房屋费用报表

java110-db/src/main/resources/mapper/report/BaseDataStatisticsServiceDaoImplMapper.xml

@@ -517,6 +517,15 @@
         <if test="communityId != null and communityId != ''">
             and br.community_id = #{communityId}
         </if>
+        <if test="floorNum != null and floorNum != ''">
+            and f.floor_num = #{floorNum}
+        </if>
+        <if test="unitNum != null and unitNum != ''">
+            and bu.unit_num = #{unitNum}
+        </if>
+        <if test="roomNum != null and roomNum != ''">
+            and br.room_num = #{roomNum}
+        </if>
         group by br.community_id, bo.name,bo.sex,bo.link,f.floor_num,bu.unit_num,br.room_num,br.room_id,borr.start_time,br.state,br.built_up_area,pfc.square_price,pfc.config_id,pfc.fee_name
         order by br.community_id,f.floor_num,bu.unit_num,br.room_num
         <if test="page != -1 and page != null">
@@ -549,6 +558,15 @@
         <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
+        <if test="floorNum != null and floorNum != ''">
+            and f.floor_num = #{floorNum}
+        </if>
+        <if test="unitNum != null and unitNum != ''">
+            and bu.unit_num = #{unitNum}
+        </if>
+        <if test="roomNum != null and roomNum != ''">
+            and br.room_num = #{roomNum}
+        </if>
         and t.cur_month_time &gt;=#{startTime}
         and t.cur_month_time &lt; #{endTime}
         ) a

service-report/src/main/java/com/java110/report/cmd/admin/GetPropertyFeeSummaryCmd.java

@@ -69,6 +69,15 @@ public class GetPropertyFeeSummaryCmd extends Cmd {
             reqJson.put("endTime", (year + 1) + "-01-01");
         }
         //todo 查询房屋物业费信息
+        if(reqJson.containsKey("roomName") && !StringUtil.isEmpty(reqJson.getString("roomName"))){
+            String[] roomNames = reqJson.getString("roomName").split("-",3);
+            if(roomNames.length != 3){
+                throw new CmdException("房屋名称查询条件错误");
+            }
+            reqJson.put("floorNum",roomNames[0]);
+            reqJson.put("unitNum",roomNames[1]);
+            reqJson.put("roomNum",roomNames[2]);
+        }