소스 검색

加入数据导入框架

wuxw 2 년 전
부모
커밋
8478e0fc58

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

@@ -485,23 +485,23 @@
         select max(pay_fee_time) from pay_fee_detail_month pfdm
         select max(pay_fee_time) from pay_fee_detail_month pfdm
         where pfdm.config_id = pfc.config_id and pfdm.obj_id = br.room_id
         where pfdm.config_id = pfc.config_id and pfdm.obj_id = br.room_id
         and pfdm.status_cd = '0' and pfdm.detail_id != '-1'
         and pfdm.status_cd = '0' and pfdm.detail_id != '-1'
-        and pfdm.cur_month_time >=#{startTime} and pfdm.cur_month_time < #{endTIme}
+        and pfdm.cur_month_time >=#{startTime} and pfdm.cur_month_time < #{endTime}
         ) payFeeTime,
         ) payFeeTime,
         (
         (
         select sum(pfdm.receivable_amount) from pay_fee_detail_month pfdm
         select sum(pfdm.receivable_amount) from pay_fee_detail_month pfdm
         where pfdm.config_id = pfc.config_id
         where pfdm.config_id = pfc.config_id
         and pfdm.obj_id = br.room_id
         and pfdm.obj_id = br.room_id
-        and pfdm.status_cd = '0' and pfdm.cur_month_time >=#{startTime} and pfdm.cur_month_time < #{endTIme}
+        and pfdm.status_cd = '0' and pfdm.cur_month_time >=#{startTime} and pfdm.cur_month_time < #{endTime}
         ) receivableAmount,
         ) receivableAmount,
         (
         (
         select sum(pfdm.received_amount) from pay_fee_detail_month pfdm
         select sum(pfdm.received_amount) from pay_fee_detail_month pfdm
         where pfdm.config_id = pfc.config_id and pfdm.obj_id = br.room_id
         where pfdm.config_id = pfc.config_id and pfdm.obj_id = br.room_id
-        and pfdm.status_cd = '0' and pfdm.cur_month_time >=#{startTime} and pfdm.cur_month_time < #{endTIme}
+        and pfdm.status_cd = '0' and pfdm.cur_month_time >=#{startTime} and pfdm.cur_month_time < #{endTime}
         ) receivedAmount,
         ) receivedAmount,
         (
         (
         select sum(pfdm.receivable_amount) from pay_fee_detail_month pfdm
         select sum(pfdm.receivable_amount) from pay_fee_detail_month pfdm
         where pfdm.config_id = pfc.config_id and pfdm.obj_id = br.room_id
         where pfdm.config_id = pfc.config_id and pfdm.obj_id = br.room_id
-        and pfdm.status_cd = '0' and pfdm.detail_id = '-1' and pfdm.cur_month_time >=#{startTime} and pfdm.cur_month_time < #{endTIme}
+        and pfdm.status_cd = '0' and pfdm.detail_id = '-1' and pfdm.cur_month_time >=#{startTime} and pfdm.cur_month_time < #{endTime}
         ) oweAmount
         ) oweAmount
         from building_room br
         from building_room br
         left join building_unit bu on br.unit_id = br.unit_id and bu.status_cd = '0'
         left join building_unit bu on br.unit_id = br.unit_id and bu.status_cd = '0'

+ 1 - 0
service-report/src/main/java/com/java110/report/smo/impl/BaseDataStatisticsInnerServiceSMOImpl.java

@@ -170,6 +170,7 @@ public class BaseDataStatisticsInnerServiceSMOImpl extends BaseServiceSMO implem
 
 
         if (page != PageDto.DEFAULT_PAGE) {
         if (page != PageDto.DEFAULT_PAGE) {
             info.put("page",(page - 1) * row);
             info.put("page",(page - 1) * row);
+            info.put("row", row);
         }
         }
         List<Map> infos = baseDataStatisticsServiceDaoImpl.getPropertyFeeSummaryData(info);
         List<Map> infos = baseDataStatisticsServiceDaoImpl.getPropertyFeeSummaryData(info);
         return infos;
         return infos;