From d3e23e26fcfc17e770fca7c29b290ef5082e5734 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 04 七月 2023 22:32:00 +0800
Subject: [PATCH] 优化1.5报表相关bug
---
service-report/src/main/java/com/java110/report/bmo/reportOwnerPayFee/impl/GetReportOwnerPayFeeBMOImpl.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/bmo/reportOwnerPayFee/impl/GetReportOwnerPayFeeBMOImpl.java b/service-report/src/main/java/com/java110/report/bmo/reportOwnerPayFee/impl/GetReportOwnerPayFeeBMOImpl.java
index 09a3ef7..dac7eb2 100644
--- a/service-report/src/main/java/com/java110/report/bmo/reportOwnerPayFee/impl/GetReportOwnerPayFeeBMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/bmo/reportOwnerPayFee/impl/GetReportOwnerPayFeeBMOImpl.java
@@ -1,7 +1,7 @@
package com.java110.report.bmo.reportOwnerPayFee.impl;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.reportOwnerPayFee.ReportOwnerPayFeeDto;
+import com.java110.dto.reportFee.ReportOwnerPayFeeDto;
import com.java110.intf.report.IReportOwnerPayFeeInnerServiceSMO;
import com.java110.report.bmo.reportOwnerPayFee.IGetReportOwnerPayFeeBMO;
import com.java110.utils.util.DateUtil;
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.List;
@Service("getReportOwnerPayFeeBMOImpl")
@@ -26,14 +27,18 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public ResponseEntity<String> get(ReportOwnerPayFeeDto reportOwnerPayFeeDto) {
-
-
+ if (!StringUtil.isEmpty(reportOwnerPayFeeDto.getPfYear())) {
+ reportOwnerPayFeeDto.setFeeEndTime(reportOwnerPayFeeDto.getPfYear() + "-01-01");
+ } else {
+ Calendar calendar = Calendar.getInstance();
+ reportOwnerPayFeeDto.setFeeEndTime(calendar.get(Calendar.YEAR) + "-01-01");
+ }
int count = reportOwnerPayFeeInnerServiceSMOImpl.queryReportOwnerPayFeesCount(reportOwnerPayFeeDto);
List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos = null;
if (count > 0) {
reportOwnerPayFeeDtos = reportOwnerPayFeeInnerServiceSMOImpl.queryReportOwnerPayFees(reportOwnerPayFeeDto);
- refreshOwnerPayFeeDto(reportOwnerPayFeeDtos,reportOwnerPayFeeDto);
+ refreshOwnerPayFeeDto(reportOwnerPayFeeDtos, reportOwnerPayFeeDto);
} else {
reportOwnerPayFeeDtos = new ArrayList<>();
}
@@ -48,7 +53,7 @@
/**
* @param reportOwnerPayFeeDtos
*/
- private void refreshOwnerPayFeeDto(List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos,ReportOwnerPayFeeDto tmpReportOwnerPayFeeDto) {
+ private void refreshOwnerPayFeeDto(List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos, ReportOwnerPayFeeDto tmpReportOwnerPayFeeDto) {
if (reportOwnerPayFeeDtos == null || reportOwnerPayFeeDtos.size() < 1) {
return;
}
@@ -70,20 +75,21 @@
ReportOwnerPayFeeDto reportOwnerPayFeeDto = new ReportOwnerPayFeeDto();
reportOwnerPayFeeDto.setFeeIds(feeIds.toArray(new String[feeIds.size()]));
reportOwnerPayFeeDto.setPfYear(tmpReportOwnerPayFeeDto.getPfYear());
+ reportOwnerPayFeeDto.setConfigId(tmpReportOwnerPayFeeDto.getConfigId());
- if(StringUtil.isEmpty(reportOwnerPayFeeDto.getPfYear())){
- reportOwnerPayFeeDto.setPfYear(DateUtil.getYear()+"");
+ if (StringUtil.isEmpty(reportOwnerPayFeeDto.getPfYear())) {
+ reportOwnerPayFeeDto.setPfYear(DateUtil.getYear() + "");
}
List<ReportOwnerPayFeeDto> tmpReportOwnerPayFeeDtos
= reportOwnerPayFeeInnerServiceSMOImpl.queryReportOwnerMonthPayFees(reportOwnerPayFeeDto);
+ List<ReportOwnerPayFeeDto> tmoNewReportOwnerPayFeeDtos = null;
- List<ReportOwnerPayFeeDto> tmoNewReportOwnerPayFeeDtos = new ArrayList<>();
-
- for(ReportOwnerPayFeeDto oldReportOwnerPayFeeDto : reportOwnerPayFeeDtos){
- for(ReportOwnerPayFeeDto newReportOwnerPayFeeDto : tmpReportOwnerPayFeeDtos){
- if(oldReportOwnerPayFeeDto.getFeeId().equals(newReportOwnerPayFeeDto.getFeeId())){
+ for (ReportOwnerPayFeeDto oldReportOwnerPayFeeDto : reportOwnerPayFeeDtos) {
+ tmoNewReportOwnerPayFeeDtos = new ArrayList<>();
+ for (ReportOwnerPayFeeDto newReportOwnerPayFeeDto : tmpReportOwnerPayFeeDtos) {
+ if (oldReportOwnerPayFeeDto.getFeeId().equals(newReportOwnerPayFeeDto.getFeeId())) {
tmoNewReportOwnerPayFeeDtos.add(newReportOwnerPayFeeDto);
}
}
--
Gitblit v1.8.0