From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码
---
service-report/src/main/java/com/java110/report/bmo/reportOwnerPayFee/impl/GetReportOwnerPayFeeBMOImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 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..670849d 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;
@@ -30,6 +33,7 @@
List<ReportOwnerPayFeeDto> reportOwnerPayFeeDtos = null;
if (count > 0) {
reportOwnerPayFeeDtos = reportOwnerPayFeeInnerServiceSMOImpl.queryReportOwnerPayFees(reportOwnerPayFeeDto);
+ refreshOwnerPayFeeDto(reportOwnerPayFeeDtos,reportOwnerPayFeeDto);
} else {
reportOwnerPayFeeDtos = new ArrayList<>();
}
@@ -41,4 +45,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 = new ArrayList<>();
+
+ for(ReportOwnerPayFeeDto oldReportOwnerPayFeeDto : reportOwnerPayFeeDtos){
+ for(ReportOwnerPayFeeDto newReportOwnerPayFeeDto : tmpReportOwnerPayFeeDtos){
+ if(oldReportOwnerPayFeeDto.getFeeId().equals(newReportOwnerPayFeeDto.getFeeId())){
+ tmoNewReportOwnerPayFeeDtos.add(newReportOwnerPayFeeDto);
+ }
+ }
+ oldReportOwnerPayFeeDto.setReportOwnerPayFeeDtos(tmoNewReportOwnerPayFeeDtos);
+ }
+
+
+ }
+
}
--
Gitblit v1.8.0