Merge remote-tracking branch 'origin/master' into xinghong-dev

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

@@ -211,6 +211,7 @@
         left join building_owner_room_rel borr on t.room_id =  borr.room_id and borr.status_cd = '0'
         left join building_owner bo on borr.owner_id =  bo.member_id and bo.status_cd = '0'
         WHERE 1 =1
+        and t.status_cd = '0'
         and u.unit_id = #{unitId}
         and t.community_id= #{communityId}
         order by CONVERT(t.layer,SIGNED),CONVERT(t.room_num,SIGNED)

service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java

@@ -133,17 +133,18 @@ public class PayBatchFeeCmd extends Cmd {
                 throw new IllegalArgumentException("费用项不存在");
             }
             Date maxEndTime = feeDtos.get(0).getDeadlineTime();
-            if (FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+            if (!FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
                 try {
                     maxEndTime = DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A);
                 } catch (ParseException e) {
                     logger.error("比较费用日期失败", e);
                 }
+                Date newDate = DateUtil.stepMonth(endTime, paramInObj.getInteger("cycles") - 1);
+                if (newDate.getTime() > maxEndTime.getTime()) {
+                    throw new IllegalArgumentException("缴费周期超过 缴费结束时间");
+                }
             }
-            Date newDate = DateUtil.stepMonth(endTime, paramInObj.getInteger("cycles") - 1);
-            if (newDate.getTime() > maxEndTime.getTime()) {
-                throw new IllegalArgumentException("缴费周期超过 缴费结束时间");
-            }
+
         }
     }