|
@@ -208,6 +208,13 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
|
|
List<OrganizationEvaluationRule> ruleList = ruleListall.stream()
|
|
List<OrganizationEvaluationRule> ruleList = ruleListall.stream()
|
|
.filter(rule -> rule.getBinSection().contains(bi.getId())).collect(Collectors.toList());
|
|
.filter(rule -> rule.getBinSection().contains(bi.getId())).collect(Collectors.toList());
|
|
|
|
|
|
|
|
+ //如果是风电特殊处理
|
|
|
|
+ if("FD".equals(bi.getSectionCode())){
|
|
|
|
+ ruleList = ruleListall.stream()
|
|
|
|
+ .filter(rule -> rule.getBinSection().contains(bi.getId())||rule.getBinSection().contains(bi.getMemo3())).collect(Collectors.toList());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
//各板块明细存储
|
|
//各板块明细存储
|
|
List<EvaluateReportInfo> evaluateRuleInfoList = new ArrayList<>();
|
|
List<EvaluateReportInfo> evaluateRuleInfoList = new ArrayList<>();
|
|
|
|
|