Commit 23a7fd00 by zhangkb

添加指标考核结果排名判空逻辑

parent d32833c2
...@@ -295,6 +295,7 @@ public class IndicatorsReportService { ...@@ -295,6 +295,7 @@ public class IndicatorsReportService {
Map<String,String> valueMap = new HashMap<>(); Map<String,String> valueMap = new HashMap<>();
//前三 //前三
for(DriveIndCalResultDef calResult : calResults) { for(DriveIndCalResultDef calResult : calResults) {
if(calResult.getRank()!=null) {
valueMap.put(calResult.getCompareObj(), calResult.getValue()); valueMap.put(calResult.getCompareObj(), calResult.getValue());
if(calResult.getRank()==1 || calResult.getRank()==2 || calResult.getRank()==3) { if(calResult.getRank()==1 || calResult.getRank()==2 || calResult.getRank()==3) {
if(calResult.getCompareObj().equals(indReportData.getCompareObj())) { if(calResult.getCompareObj().equals(indReportData.getCompareObj())) {
...@@ -307,6 +308,8 @@ public class IndicatorsReportService { ...@@ -307,6 +308,8 @@ public class IndicatorsReportService {
} }
} }
} }
}
if(!valueMap.isEmpty()) {
//末三 //末三
Map<String,Integer> rankValue = new HashMap<>(); Map<String,Integer> rankValue = new HashMap<>();
if("0".equals(indRule)) {//正向 if("0".equals(indRule)) {//正向
...@@ -328,6 +331,7 @@ public class IndicatorsReportService { ...@@ -328,6 +331,7 @@ public class IndicatorsReportService {
} }
} }
} }
}
return indReportData; return indReportData;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment