From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/bmo/reportInfoSettingTitle/impl/GetReportInfoSettingTitleBMOImpl.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/bmo/reportInfoSettingTitle/impl/GetReportInfoSettingTitleBMOImpl.java b/service-report/src/main/java/com/java110/report/bmo/reportInfoSettingTitle/impl/GetReportInfoSettingTitleBMOImpl.java
index dfec7da..9298122 100644
--- a/service-report/src/main/java/com/java110/report/bmo/reportInfoSettingTitle/impl/GetReportInfoSettingTitleBMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/bmo/reportInfoSettingTitle/impl/GetReportInfoSettingTitleBMOImpl.java
@@ -1,13 +1,15 @@
package com.java110.report.bmo.reportInfoSettingTitle.impl;
+import com.java110.dto.reportInfo.ReportInfoSettingTitleValueDto;
import com.java110.intf.report.IReportInfoSettingTitleInnerServiceSMO;
+import com.java110.intf.report.IReportInfoSettingTitleValueInnerServiceSMO;
import com.java110.report.bmo.reportInfoSettingTitle.IGetReportInfoSettingTitleBMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-import com.java110.dto.reportInfoSettingTitle.ReportInfoSettingTitleDto;
+import com.java110.dto.reportInfo.ReportInfoSettingTitleDto;
import java.util.ArrayList;
import java.util.List;
@@ -17,7 +19,8 @@
@Autowired
private IReportInfoSettingTitleInnerServiceSMO reportInfoSettingTitleInnerServiceSMOImpl;
-
+ @Autowired
+ private IReportInfoSettingTitleValueInnerServiceSMO reportInfoSettingTitleValueInnerServiceSMOImpl;
/**
*
*
@@ -32,6 +35,7 @@
List<ReportInfoSettingTitleDto> reportInfoSettingTitleDtos = null;
if (count > 0) {
reportInfoSettingTitleDtos = reportInfoSettingTitleInnerServiceSMOImpl.queryReportInfoSettingTitles(reportInfoSettingTitleDto);
+ refreshTitileValues(reportInfoSettingTitleDtos);
} else {
reportInfoSettingTitleDtos = new ArrayList<>();
}
@@ -43,4 +47,35 @@
return responseEntity;
}
+
+ private void refreshTitileValues(List<ReportInfoSettingTitleDto> reportInfoSettingTitleDtos) {
+
+ if (reportInfoSettingTitleDtos == null || reportInfoSettingTitleDtos.size() < 1) {
+ return;
+ }
+
+ List<String> titleIds = new ArrayList<>();
+ for (ReportInfoSettingTitleDto reportInfoSettingTitleDto : reportInfoSettingTitleDtos) {
+ titleIds.add(reportInfoSettingTitleDto.getTitleId());
+ }
+
+ ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto = new ReportInfoSettingTitleValueDto();
+ reportInfoSettingTitleValueDto.setTitleIds(titleIds.toArray(new String[titleIds.size()]));
+ reportInfoSettingTitleValueDto.setCommunityId(reportInfoSettingTitleDtos.get(0).getCommunityId());
+ List<ReportInfoSettingTitleValueDto> reportInfoSettingTitleValueDtos
+ = reportInfoSettingTitleValueInnerServiceSMOImpl.queryReportInfoSettingTitleValues(reportInfoSettingTitleValueDto);
+
+ List<ReportInfoSettingTitleValueDto> tmpReportInfoSettingTitleValueDtos = null;
+ for (ReportInfoSettingTitleDto reportInfoSettingTitleDto : reportInfoSettingTitleDtos) {
+ tmpReportInfoSettingTitleValueDtos = new ArrayList<>();
+ for (ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto1 : reportInfoSettingTitleValueDtos) {
+ if (reportInfoSettingTitleDto.getTitleId().equals(reportInfoSettingTitleValueDto1.getTitleId())) {
+ tmpReportInfoSettingTitleValueDtos.add(reportInfoSettingTitleValueDto1);
+ }
+ }
+ reportInfoSettingTitleDto.setReportInfoSettingTitleValueDtos(tmpReportInfoSettingTitleValueDtos);
+ }
+
+
+ }
}
--
Gitblit v1.8.0