From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-report/src/main/java/com/java110/report/bmo/reportOwnerPayFee/impl/GetReportOwnerPayFeeBMOImpl.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 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 c680ca1..4389429 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
@@ -4,6 +4,7 @@
import com.java110.dto.reportOwnerPayFee.ReportOwnerPayFeeDto;
import com.java110.intf.report.IReportOwnerPayFeeInnerServiceSMO;
import com.java110.report.bmo.reportOwnerPayFee.IGetReportOwnerPayFeeBMO;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +13,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.List;
@Service("getReportOwnerPayFeeBMOImpl")
@@ -25,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);
+ refreshOwnerPayFeeDto(reportOwnerPayFeeDtos, reportOwnerPayFeeDto);
} else {
reportOwnerPayFeeDtos = new ArrayList<>();
}
@@ -47,7 +53,7 @@
/**
* @param reportOwnerPayFeeDtos
*/
- private void refreshOwnerPayFeeDto(List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos) {
+ private void refreshOwnerPayFeeDto(List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos, ReportOwnerPayFeeDto tmpReportOwnerPayFeeDto) {
if (reportOwnerPayFeeDtos == null || reportOwnerPayFeeDtos.size() < 1) {
return;
}
@@ -66,6 +72,30 @@
feeIds.add(reportOwnerPayFeeDto.getFeeId());
}
+ 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() + "");
+ }
+ List<ReportOwnerPayFeeDto> tmpReportOwnerPayFeeDtos
+ = reportOwnerPayFeeInnerServiceSMOImpl.queryReportOwnerMonthPayFees(reportOwnerPayFeeDto);
+
+
+ List<ReportOwnerPayFeeDto> tmoNewReportOwnerPayFeeDtos = null;
+
+ for (ReportOwnerPayFeeDto oldReportOwnerPayFeeDto : reportOwnerPayFeeDtos) {
+ tmoNewReportOwnerPayFeeDtos = new ArrayList<>();
+ for (ReportOwnerPayFeeDto newReportOwnerPayFeeDto : tmpReportOwnerPayFeeDtos) {
+ if (oldReportOwnerPayFeeDto.getFeeId().equals(newReportOwnerPayFeeDto.getFeeId())) {
+ tmoNewReportOwnerPayFeeDtos.add(newReportOwnerPayFeeDto);
+ }
+ }
+ oldReportOwnerPayFeeDto.setReportOwnerPayFeeDtos(tmoNewReportOwnerPayFeeDtos);
+ }
+
}
--
Gitblit v1.8.0