Lianxun_Java.git

			@@ -19,6 +19,7 @@
			import org.springframework.beans.factory.annotation.Autowired;

			import java.text.ParseException;
			import java.util.Calendar;
			import java.util.List;

			/**
			@@ -86,6 +87,14 @@
			queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
			queryStatisticsDto.setFeeTypeCd(reqJson.getString("feeTypeCd"));

			String monthFastDate = DateUtil.getFormatTimeStringB(DateUtil.getFirstDate(reqJson.getString("startDate")));
			String monthLastDate = DateUtil.getFormatTimeStringB(DateUtil.getNextMonthFirstDate(reqJson.getString("startDate")));
			String startDate = reqJson.getString("startDate");
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(DateUtil.getDateFromStringB(startDate));
			calendar.add(Calendar.DAY_OF_MONTH, 1);
			String endDate = DateUtil.getFormatTimeStringB(calendar.getTime());

			// todo 查询楼栋
			FloorDto floorDto = new FloorDto();
			floorDto.setFloorId(floorId);
			@@ -98,22 +107,22 @@
			long roomCount = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
			data.put("roomCount", roomCount);

			// todo 查询空置户数
			long freeCount = baseDataStatisticsImpl.getFreeRoomCount(queryStatisticsDto);
			data.put("freeCount", freeCount);


			// todo 查询历史欠费
			//这里设置查询月1日不然历史和总欠费一样有点奇怪
			queryStatisticsDto.setStartDate(monthFastDate);
			double hisMonthOweFee = feeStatisticsImpl.getHisMonthOweFee(queryStatisticsDto);
			data.put("hisMonthOweFee", hisMonthOweFee);

			// todo 查询总欠费
			queryStatisticsDto.setEndDate(monthLastDate);
			double oweFee = feeStatisticsImpl.getOweFee(queryStatisticsDto);
			data.put("oweFee", oweFee);

			// todo 本日已交户数
			queryStatisticsDto.setStartDate(DateUtil.getFormatTimeStringB(DateUtil.getCurrentDate()) + " 00:00:00");
			queryStatisticsDto.setEndDate(DateUtil.getFormatTimeStringB(DateUtil.getCurrentDate()) + " 23:59:59");
			queryStatisticsDto.setHisDate(DateUtil.getFormatTimeStringB(DateUtil.getFirstDate()));
			queryStatisticsDto.setStartDate(startDate);
			queryStatisticsDto.setEndDate(endDate);
			double todayReceivedRoomCount = feeStatisticsImpl.getReceivedRoomCount(queryStatisticsDto);
			data.put("todayReceivedRoomCount", todayReceivedRoomCount);

			@@ -122,26 +131,54 @@
			data.put("todayReceivedRoomAmount", todayReceivedRoomAmount);

			// todo 历史欠费清缴户
			queryStatisticsDto.setStartDate(startDate);
			queryStatisticsDto.setEndDate(endDate);
			queryStatisticsDto.setHisDate(monthFastDate);
			double hisOweReceivedRoomCount = feeStatisticsImpl.getHisOweReceivedRoomCount(queryStatisticsDto);
			data.put("hisOweReceivedRoomCount", hisOweReceivedRoomCount);
			// todo 历史欠费清缴金额
			double hisOweReceivedRoomAmount = feeStatisticsImpl.getHisOweReceivedRoomAmount(queryStatisticsDto);
			data.put("hisOweReceivedRoomAmount", hisOweReceivedRoomAmount);

			// todo 这里时间又改回来
			queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
			queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
			// todo 本月已收户
			double monthReceivedRoomCount = feeStatisticsImpl.getReceivedRoomCount(queryStatisticsDto);
			queryStatisticsDto.setStartDate(monthFastDate);
			queryStatisticsDto.setEndDate(monthLastDate);
			double monthReceivedRoomCount = feeStatisticsImpl.getMonthReceivedDetailCount(queryStatisticsDto);
			data.put("monthReceivedRoomCount", monthReceivedRoomCount);

			// todo 已收金额
			double monthReceivedRoomAmount = feeStatisticsImpl.getReceivedRoomAmount(queryStatisticsDto);
			// todo 查询收费户
			long feeRoomCount = feeStatisticsImpl.getFeeRoomCount(queryStatisticsDto);
			data.put("feeRoomCount", feeRoomCount);

			// todo 计算欠费户
			int oweRoomCount = feeStatisticsImpl.getOweRoomCount(queryStatisticsDto);
			data.put("oweRoomCount", oweRoomCount);

			// todo 本月已收金额
			double monthReceivedRoomAmount = feeStatisticsImpl.getMonthReceivedDetailAmount(queryStatisticsDto);
			data.put("monthReceivedRoomAmount", monthReceivedRoomAmount);
			// todo 剩余未收
			double curMonthOweFee = feeStatisticsImpl.getCurMonthOweFee(queryStatisticsDto);
			data.put("curMonthOweFee", curMonthOweFee);

			//todo 查询当月应收
			queryStatisticsDto.setStartDate(monthFastDate);
			queryStatisticsDto.setEndDate(monthLastDate);
			double curReceivableFee = feeStatisticsImpl.getCurReceivableFee(queryStatisticsDto);
			data.put("curReceivableFee", curReceivableFee);

			// //todo 查询欠费追回
			// queryStatisticsDto.setStartDate(monthFastDate);
			// queryStatisticsDto.setEndDate(monthLastDate);
			// double hisReceivedFee = feeStatisticsImpl.getHisReceivedFee(queryStatisticsDto);
			// data.put("hisReceivedFee", hisReceivedFee);
			//
			// //todo 查询预交费用
			// queryStatisticsDto.setStartDate(monthFastDate);
			// queryStatisticsDto.setEndDate(monthLastDate);
			// double preReceivedFee = feeStatisticsImpl.getPreReceivedFee(queryStatisticsDto);
			// data.put("preReceivedFee", preReceivedFee);

			datas.add(data);