From 9feb0f92711c426ca024ec2000e3fac15eff120b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 六月 2021 13:06:06 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index e6b63e9..87f52be
--- a/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
@@ -173,7 +173,7 @@
reportFeeDto.setPayerObjId(tmpReportCarDto.getCarId());
reportFeeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
//reportFeeDto.setState(FeeDto.STATE_DOING);
- reportFeeDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE);
+ //reportFeeDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE);
List<ReportFeeDto> feeDtos = reportFeeServiceDaoImpl.getFees(reportFeeDto);
if (feeDtos == null || feeDtos.size() < 1) {
@@ -195,7 +195,7 @@
reportFeeYearCollectionDto.setCommunityId(tmpReportCarDto.getCommunityId());
reportFeeYearCollectionDto.setConfigId(tmpReportFeeDto.getConfigId());
reportFeeYearCollectionDto.setObjId(tmpReportFeeDto.getPayerObjId());
- reportFeeYearCollectionDto.setFeeId(tmpReportFeeDto.getFeeId());
+ //reportFeeYearCollectionDto.setFeeId(tmpReportFeeDto.getFeeId());
reportFeeYearCollectionDto.setObjType(tmpReportFeeDto.getPayerObjType());
List<ReportFeeYearCollectionDto> statistics = BeanConvertUtil.covertBeanList(
reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionDto)),
@@ -211,7 +211,7 @@
reportFeeYearCollectionPo.setObjId(tmpReportCarDto.getCarId());
reportFeeYearCollectionPo.setObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
reportFeeYearCollectionPo.setFeeName(StringUtil.isEmpty(tmpReportFeeDto.getImportFeeName()) ? tmpReportFeeDto.getFeeName() : tmpReportFeeDto.getImportFeeName());
- reportFeeYearCollectionPo.setObjName(tmpReportCarDto.getCarNum() + "(" + tmpReportCarDto.getAreaNum() + "鍋滆溅鍦�" + tmpReportCarDto.getNum() + "杞︿綅)");
+ reportFeeYearCollectionPo.setObjName(tmpReportCarDto.getCarNum());
reportFeeYearCollectionPo.setOwnerId(tmpReportCarDto.getOwnerId());
reportFeeYearCollectionPo.setOwnerName(tmpReportCarDto.getOwnerName());
reportFeeYearCollectionPo.setOwnerLink(tmpReportCarDto.getLink());
@@ -255,7 +255,8 @@
reportFeeDto.setPayerObjId(reportRoomDto.getRoomId());
reportFeeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
//reportFeeDto.setState(FeeDto.STATE_DOING);
- reportFeeDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE);
+ //reportFeeDto.setFeeFlag(FeeDto.FEE_FLAG_CYCLE);
+
List<ReportFeeDto> feeDtos = reportFeeServiceDaoImpl.getFees(reportFeeDto);
if (feeDtos == null || feeDtos.size() < 1) {
@@ -280,7 +281,7 @@
reportFeeYearCollectionDto.setCommunityId(reportRoomDto.getCommunityId());
reportFeeYearCollectionDto.setConfigId(tmpReportFeeDto.getConfigId());
reportFeeYearCollectionDto.setObjId(tmpReportFeeDto.getPayerObjId());
- reportFeeYearCollectionDto.setFeeId(tmpReportFeeDto.getFeeId());
+ //reportFeeYearCollectionDto.setFeeId(tmpReportFeeDto.getFeeId());
reportFeeYearCollectionDto.setObjType(tmpReportFeeDto.getPayerObjType());
List<ReportFeeYearCollectionDto> statistics = BeanConvertUtil.covertBeanList(
reportFeeYearCollectionServiceDaoImpl.getReportFeeYearCollectionInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionDto)),
@@ -297,9 +298,9 @@
reportFeeYearCollectionPo.setObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
reportFeeYearCollectionPo.setFeeName(StringUtil.isEmpty(tmpReportFeeDto.getImportFeeName()) ? tmpReportFeeDto.getFeeName() : tmpReportFeeDto.getImportFeeName());
if (RoomDto.ROOM_TYPE_ROOM.equals(reportRoomDto.getRoomType())) {
- reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "鏍�" + reportRoomDto.getUnitNum() + "鍗曞厓" + reportRoomDto.getRoomNum() + "瀹�");
+ reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "-" + reportRoomDto.getUnitNum() + "-" + reportRoomDto.getRoomNum());
} else {
- reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "鏍�" + reportRoomDto.getRoomNum() + "瀹�");
+ reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "-" + reportRoomDto.getRoomNum());
}
reportFeeYearCollectionPo.setOwnerId(reportRoomDto.getOwnerId());
reportFeeYearCollectionPo.setOwnerName(reportRoomDto.getOwnerName());
@@ -398,6 +399,10 @@
int curYear = Calendar.getInstance().get(Calendar.YEAR);
double cycleMonth = 12;
+ if (FeeDto.FEE_FLAG_ONCE.equals(tmpReportFeeDto.getFeeFlag())) { // 涓�娆℃�ц垂鐢ㄦ病鏈夊簲鏀� 鎵�浠ュ啓鎴�0
+ return 0;
+ }
+
if (endYear == curYear) {
try {
cycleMonth = computeFeeSMOImpl.dayCompare(DateUtil.getDateFromString(curYear + "-01-01", DateUtil.DATE_FORMATE_STRING_B), tmpReportFeeDto.getConfigEndTime());
@@ -419,12 +424,13 @@
*/
private double getReceivedAmount(ReportFeeDto tmpReportFeeDto, int year) {
ReportFeeDetailDto feeDetailDto = new ReportFeeDetailDto();
- feeDetailDto.setFeeId(tmpReportFeeDto.getFeeId());
+ feeDetailDto.setConfigId(tmpReportFeeDto.getConfigId());
+ feeDetailDto.setPayerObjId(tmpReportFeeDto.getPayerObjId());
String flag = CommonCache.getValue(RECEIVED_TIME);
if (RECEIVED_TIME_START.equals(flag)) {
- feeDetailDto.setStartTime(year + "");
+ feeDetailDto.setCurStartYear(year + "");
} else {
- feeDetailDto.setEndTime(year + "");
+ feeDetailDto.setCurEndYear(year + "");
}
double receivedAmount = reportFeeServiceDaoImpl.getFeeReceivedAmount(feeDetailDto);
--
Gitblit v1.8.0