From cb4527a96298419ffd217d2767202dd0520457b2 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 05 三月 2021 10:29:15 +0800
Subject: [PATCH] 优化 安徽客户提交bug 报表专家功能调整
---
service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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
index a3b86fc..3d95ff6 100644
--- 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
@@ -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,7 +424,8 @@
*/
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.setCurStartYear(year + "");
--
Gitblit v1.8.0