From a13573d5ef8d16f4bc2535a3c89c2891e6f5b56c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 15:33:30 +0800
Subject: [PATCH] optimize
---
service-report/src/main/java/com/java110/report/bmo/reportOwnerPayFee/impl/GetReportOwnerPayFeeBMOImpl.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 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 8a11834..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
@@ -1,8 +1,11 @@
package com.java110.report.bmo.reportOwnerPayFee.impl;
+import com.java110.dto.fee.FeeDto;
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;
import org.springframework.http.HttpStatus;
@@ -10,6 +13,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.List;
@Service("getReportOwnerPayFeeBMOImpl")
@@ -23,13 +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);
} else {
reportOwnerPayFeeDtos = new ArrayList<>();
}
@@ -41,4 +50,53 @@
return responseEntity;
}
+ /**
+ * @param reportOwnerPayFeeDtos
+ */
+ private void refreshOwnerPayFeeDto(List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos, ReportOwnerPayFeeDto tmpReportOwnerPayFeeDto) {
+ if (reportOwnerPayFeeDtos == null || reportOwnerPayFeeDtos.size() < 1) {
+ return;
+ }
+ List<String> feeIds = new ArrayList<>();
+ for (ReportOwnerPayFeeDto reportOwnerPayFeeDto : reportOwnerPayFeeDtos) {
+ if (!StringUtil.isEmpty(reportOwnerPayFeeDto.getImportFeeName())) {
+ reportOwnerPayFeeDto.setFeeName(reportOwnerPayFeeDto.getImportFeeName());
+ }
+ if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(reportOwnerPayFeeDto.getPayerObjType())) {
+ reportOwnerPayFeeDto.setObjName(reportOwnerPayFeeDto.getRoomName());
+ } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(reportOwnerPayFeeDto.getPayerObjType())) {
+ reportOwnerPayFeeDto.setObjName(reportOwnerPayFeeDto.getCarNum());
+ } else if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(reportOwnerPayFeeDto.getPayerObjType())) {
+ reportOwnerPayFeeDto.setObjName(reportOwnerPayFeeDto.getContractCode());
+ }
+ 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