优化报表代码

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

@@ -2641,6 +2641,12 @@
         <if test="objName !=null and objName != ''">
             and rfms.obj_name= #{objName}
         </if>
+        <if test="feeYear !=null and feeYear != ''">
+            and t.fee_year= #{feeYear}
+        </if>
+        <if test="feeMonth !=null and feeMonth != ''">
+            and t.fee_month= #{feeMonth}
+        </if>
         GROUP BY t.floor_num
         ) a,
         (select t.floor_num floorNum,SUM(curT.owe_amount) curOweAmount

service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java

@@ -150,6 +150,9 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
         ownerDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
         List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
         for (ImportRoomFee importRoomFee : tmpImportRoomFees) {
+            if(StringUtil.isEmpty(importRoomFee.getRoomId())){
+                throw new IllegalArgumentException("房屋不存在，"+importRoomFee.getFloorNum()+"-"+importRoomFee.getUnitNum()+"-"+importRoomFee.getRoomNum());
+            }
             for (OwnerDto tmpOwnerDto : ownerDtos) {
                 if (importRoomFee.getRoomId().equals(tmpOwnerDto.getRoomId())) {
                     importRoomFee.setOwnerId(tmpOwnerDto.getOwnerId());