|
@@ -216,6 +216,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
|
|
//计算前置属性(差值、利润贡献、单位千瓦利润)的最大最小值
|
|
//计算前置属性(差值、利润贡献、单位千瓦利润)的最大最小值
|
|
for (Map.Entry<String, List<OrganizationEvaluationInfoResDTO>> binSectionGropEntry : binSectionGropList.entrySet()){
|
|
for (Map.Entry<String, List<OrganizationEvaluationInfoResDTO>> binSectionGropEntry : binSectionGropList.entrySet()){
|
|
|
|
|
|
|
|
+ List<OrganizationEvaluationInfo> listUpdateInfos = new ArrayList<>();
|
|
if (binSectionGropEntry.getValue().size() > 0){
|
|
if (binSectionGropEntry.getValue().size() > 0){
|
|
//按照指标分组
|
|
//按照指标分组
|
|
Map<String, List<OrganizationEvaluationInfoResDTO>> indicatorGropList = binSectionGropEntry.getValue().stream().collect(Collectors.groupingBy(OrganizationEvaluationInfoResDTO::getIndicatorId));
|
|
Map<String, List<OrganizationEvaluationInfoResDTO>> indicatorGropList = binSectionGropEntry.getValue().stream().collect(Collectors.groupingBy(OrganizationEvaluationInfoResDTO::getIndicatorId));
|
|
@@ -264,13 +265,17 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
|
|
info.setNonQuantifiedValue(score + "");
|
|
info.setNonQuantifiedValue(score + "");
|
|
dto.setQuantifiedValue(score);
|
|
dto.setQuantifiedValue(score);
|
|
dto.setNonQuantifiedValue(score + "");
|
|
dto.setNonQuantifiedValue(score + "");
|
|
- this.saveOrUpdate(info);
|
|
|
|
|
|
+
|
|
|
|
+ listUpdateInfos.add(info);
|
|
|
|
+// this.saveOrUpdate(info);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//计算差值等的最大值最小值
|
|
//计算差值等的最大值最小值
|
|
|
|
+
|
|
|
|
+ this.saveOrUpdateBatch(listUpdateInfos);
|
|
iCalculateIndicatorItemInfoService.saveIndicatorInfoDTO( organizationEvaluationId,indicatorGropListEntry.getValue());
|
|
iCalculateIndicatorItemInfoService.saveIndicatorInfoDTO( organizationEvaluationId,indicatorGropListEntry.getValue());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -281,6 +286,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
|
|
for (Map.Entry<String, List<OrganizationEvaluationInfoResDTO>> binSectionGropEntry : binSectionGropList.entrySet()){
|
|
for (Map.Entry<String, List<OrganizationEvaluationInfoResDTO>> binSectionGropEntry : binSectionGropList.entrySet()){
|
|
|
|
|
|
if (binSectionGropEntry.getValue().size() > 0){
|
|
if (binSectionGropEntry.getValue().size() > 0){
|
|
|
|
+ List<OrganizationEvaluationInfo> listUpdateInfos = new ArrayList<>();
|
|
//按照指标分组
|
|
//按照指标分组
|
|
Map<String, List<OrganizationEvaluationInfoResDTO>> indicatorGropList = binSectionGropEntry.getValue().stream().collect(Collectors.groupingBy(OrganizationEvaluationInfoResDTO::getIndicatorId));
|
|
Map<String, List<OrganizationEvaluationInfoResDTO>> indicatorGropList = binSectionGropEntry.getValue().stream().collect(Collectors.groupingBy(OrganizationEvaluationInfoResDTO::getIndicatorId));
|
|
|
|
|
|
@@ -357,7 +363,8 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
|
|
info.setNonQuantifiedValue(score+"");
|
|
info.setNonQuantifiedValue(score+"");
|
|
dto.setQuantifiedValue(score);
|
|
dto.setQuantifiedValue(score);
|
|
dto.setNonQuantifiedValue(score+"");
|
|
dto.setNonQuantifiedValue(score+"");
|
|
- this.saveOrUpdate(info);
|
|
|
|
|
|
+ listUpdateInfos.add(info);
|
|
|
|
+// this.saveOrUpdate(info);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -384,6 +391,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ this.saveOrUpdateBatch(listUpdateInfos);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|