|
|
@@ -504,10 +504,14 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
|
|
|
boolean titlemark = true;//标记生成标题
|
|
|
List<OrganizationEvaluationInfoResDTO> infoResDTOList = baseMapper.selectEvaluationInfoList(organizationEvaluationId,organizationShortName, indicatorId,binSection,binStage,"");
|
|
|
List<IndicatorDictionary> dictionaryList = indicatorDictionaryService.list("", indicatorId, "", "");
|
|
|
+ List<IndicatorDictionary> dictionaryList2 = dictionaryList.stream().filter(dl -> !"1642801934302707714".equals(dl.getIndicatorId()) || !"CZMAX".equals(dl.getOptionCode()) && !"CZMIN".equals(dl.getOptionCode())).collect(Collectors.toList());
|
|
|
Indicator indicator = indicatorService.getById(indicatorId);
|
|
|
//根据组织（公司）id分组
|
|
|
Map<String, List<OrganizationEvaluationInfoResDTO>> groupedData = infoResDTOList.stream()
|
|
|
.collect(Collectors.groupingBy(OrganizationEvaluationInfoResDTO::getOrganizationId));
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
List<Map> mapList = new ArrayList<>();
|
|
|
|
|
|
//设置数据标题
|
|
|
@@ -565,6 +569,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
//获取行数据
|
|
|
//遍历按照公司分组后的数据
|
|
|
for (Map.Entry<String, List<OrganizationEvaluationInfoResDTO>> entry : groupedData.entrySet()) {
|
|
|
@@ -581,7 +586,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
|
|
|
double score = 0.00;
|
|
|
double minScore = 0.00;
|
|
|
double maxScore = 0.00;
|
|
|
- for (IndicatorDictionary d : dictionaryList) {
|
|
|
+ for (IndicatorDictionary d : dictionaryList2) {
|
|
|
if (!d.getIsShow()) {
|
|
|
continue;
|
|
|
}
|
songwb