Lianxun_Java.git

			@@ -1,12 +1,11 @@
			package com.java110.report.api;

			import com.alibaba.fastjson.JSONObject;
			import com.java110.dto.FloorDto;
			import com.java110.dto.RoomDto;
			import com.java110.dto.room.RoomDto;
			import com.java110.dto.repair.RepairUserDto;
			import com.java110.dto.report.ReportDeposit;
			import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
			import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
			import com.java110.dto.reportFee.ReportFeeMonthStatisticsDto;
			import com.java110.po.reportFee.ReportFeeMonthStatisticsPo;
			import com.java110.report.bmo.reportFeeMonthStatistics.IDeleteReportFeeMonthStatisticsBMO;
			import com.java110.report.bmo.reportFeeMonthStatistics.IGetReportFeeMonthStatisticsBMO;
			import com.java110.report.bmo.reportFeeMonthStatistics.ISaveReportFeeMonthStatisticsBMO;
			@@ -21,7 +20,6 @@

			import java.util.Calendar;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;

			@RestController
			@@ -115,44 +113,7 @@
			return getReportFeeMonthStatisticsBMOImpl.get(reportFeeMonthStatisticsDto);
			}

			/**
			* 查询费用汇总表
			*
			* @param communityId 小区ID
			* @return
			* @serviceCode /reportFeeMonthStatistics/queryReportFeeSummary
			* @path /app/reportFeeMonthStatistics/queryReportFeeSummary
			*/
			@RequestMapping(value = "/queryReportFeeSummary", method = RequestMethod.GET)
			public ResponseEntity<String> queryReportFeeSummary(@RequestParam(value = "communityId") String communityId,
			@RequestParam(value = "floorId", required = false) String floorId,
			@RequestParam(value = "floorNum", required = false) String floorNum,
			@RequestParam(value = "unitNum", required = false) String unitNum,
			@RequestParam(value = "unitId", required = false) String unitId,
			@RequestParam(value = "roomId", required = false) String roomId,
			@RequestParam(value = "roomNum", required = false) String roomNum,
			@RequestParam(value = "startTime", required = false) String startTime,
			@RequestParam(value = "endTime", required = false) String endTime,
			@RequestParam(value = "configIds", required = false) String configIds,
			@RequestParam(value = "page") int page,
			@RequestParam(value = "row") int row) {
			ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
			reportFeeMonthStatisticsDto.setPage(page);
			reportFeeMonthStatisticsDto.setRow(row);
			reportFeeMonthStatisticsDto.setCommunityId(communityId);
			reportFeeMonthStatisticsDto.setFloorId(floorId);
			reportFeeMonthStatisticsDto.setFloorNum(floorNum);
			reportFeeMonthStatisticsDto.setUnitId(unitId);
			reportFeeMonthStatisticsDto.setUnitNum(unitNum);
			reportFeeMonthStatisticsDto.setRoomId(roomId);
			reportFeeMonthStatisticsDto.setRoomNum(roomNum);
			reportFeeMonthStatisticsDto.setStartTime(startTime);
			reportFeeMonthStatisticsDto.setEndTime(endTime);
			if (!StringUtil.isEmpty(configIds)) {
			reportFeeMonthStatisticsDto.setConfigIds(configIds.split(","));
			}
			return getReportFeeMonthStatisticsBMOImpl.queryReportFeeSummary(reportFeeMonthStatisticsDto);
			}


			/**
			* 查询费用汇总表
			@@ -338,6 +299,8 @@
			@RequestParam(value = "configId", required = false) String configId,
			@RequestParam(value = "startTime", required = false) String startTime,
			@RequestParam(value = "endTime", required = false) String endTime,
			@RequestParam(value = "feeStartTime", required = false) String feeStartTime,
			@RequestParam(value = "feeEndTime", required = false) String feeEndTime,
			@RequestParam(value = "objId", required = false) String objId,
			@RequestParam(value = "roomName", required = false) String roomName,
			@RequestParam(value = "page") int page,
			@@ -358,9 +321,11 @@
			reportFeeMonthStatisticsDto.setConfigId(configId);
			reportFeeMonthStatisticsDto.setStartTime(startTime);
			reportFeeMonthStatisticsDto.setEndTime(endTime);
			reportFeeMonthStatisticsDto.setFeeStartTime(feeStartTime);
			reportFeeMonthStatisticsDto.setFeeEndTime(feeEndTime);
			reportFeeMonthStatisticsDto.setObjId(objId);
			if(!StringUtil.isEmpty(roomName)){
			String[] roomNameArray = roomName.split("-");
			String[] roomNameArray = roomName.split("-",3);
			reportFeeMonthStatisticsDto.setFloorNum(roomNameArray[0]);
			reportFeeMonthStatisticsDto.setUnitNum(roomNameArray[1]);
			reportFeeMonthStatisticsDto.setRoomNum(roomNameArray[2]);
			@@ -526,29 +491,6 @@
			calendar.add(Calendar.DAY_OF_MONTH, 7);
			reportFeeMonthStatisticsDto.setEndTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
			return getReportFeeMonthStatisticsBMOImpl.queryDeadlinePaymentCount(reportFeeMonthStatisticsDto);
			}

			/**
			* 查询费用分项表
			*
			* @param communityId 小区ID
			* @return
			* @serviceCode /reportFeeMonthStatistics/queryPrePayment
			* @path /app/reportFeeMonthStatistics/queryPrePayment
			*/
			@RequestMapping(value = "/queryPrePayment", method = RequestMethod.GET)
			public ResponseEntity<String> queryPrePayment(@RequestParam(value = "communityId") String communityId,
			@RequestParam(value = "page") int page,
			@RequestParam(value = "row") int row) {
			ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
			reportFeeMonthStatisticsDto.setCommunityId(communityId);
			reportFeeMonthStatisticsDto.setPage(page);
			reportFeeMonthStatisticsDto.setRow(row);
			reportFeeMonthStatisticsDto.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
			Calendar calendar = Calendar.getInstance();
			calendar.add(Calendar.DAY_OF_MONTH, 7);
			reportFeeMonthStatisticsDto.setEndTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
			return getReportFeeMonthStatisticsBMOImpl.queryPrePayment(reportFeeMonthStatisticsDto);
			}

			/**