优化代码

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

@@ -263,8 +263,22 @@
         t.owner_id,t.owner_id ownerId,t.owner_name,t.owner_name ownerName
         from report_owe_fee t
         LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
+        LEFT JOIN building_room br on pf.payer_obj_id = br.room_id and br.status_cd = '0'
+        LEFT JOIN building_unit bu on br.unit_id = bu.unit_id and bu.status_cd = '0'
         where 1 =1
         and pf.status_cd = '0'
+        <if test="roomSubType !=null and roomSubType != ''">
+            and br.room_sub_type = #{roomSubType}
+        </if>
+        <if test="roomNum !=null and roomNum != ''">
+            and br.room_num = #{roomNum}
+        </if>
+        <if test="floorId !=null and floorId != ''">
+            and bu.floor_id = #{floorId}
+        </if>
+        <if test="unitId !=null and unitId != ''">
+            and bu.unit_id = #{unitId}
+        </if>
         <if test="configName !=null and configName != ''">
             and t.config_name= #{configName}
         </if>

service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java

@@ -135,12 +135,22 @@ public class ReportOweFeeApi {
                                                        @RequestParam(value = "configIds", required = false) String configIds,
                                                        @RequestParam(value = "payObjType", required = false) String payObjType,
                                                        @RequestParam(value = "hasOweFee", required = false) String hasOweFee,
+                                                       @RequestParam(value = "ownerName", required = false) String ownerName,
+                                                       @RequestParam(value = "floorId", required = false) String floorId,
+                                                       @RequestParam(value = "unitId", required = false) String unitId,
+                                                       @RequestParam(value = "roomSubType", required = false) String roomSubType,
+                                                       @RequestParam(value = "roomNum", required = false) String roomNum,
                                                        @RequestParam(value = "num", required = false) String num) {
         ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
         reportOweFeeDto.setPayerObjType(payObjType);
         reportOweFeeDto.setPayerObjName(num);
         reportOweFeeDto.setCommunityId(communityId);
         reportOweFeeDto.setHasOweFee(hasOweFee);
+        reportOweFeeDto.setOwnerName(ownerName);
+        reportOweFeeDto.setFloorId(floorId);
+        reportOweFeeDto.setUnitId(unitId);
+        reportOweFeeDto.setRoomSubType(roomSubType);
+        reportOweFeeDto.setRoomNum(roomNum);
         if (!StringUtil.isEmpty(configIds)) {
             String[] tmpConfigIds = configIds.split(",");
             reportOweFeeDto.setConfigIds(tmpConfigIds);