Commit d8d3a3df by zhangkb

修改对标计算逻辑

parent 190c48e6
...@@ -205,7 +205,8 @@ public class IndicatorsReportService { ...@@ -205,7 +205,8 @@ public class IndicatorsReportService {
indReportData.getIndImproveCount()+1); indReportData.getIndImproveCount()+1);
} }
} }
}else { }
if(Double.parseDouble(calGowthValue)<0){
if("1".equals(indRule)) {//反向 if("1".equals(indRule)) {//反向
//填充指标提升个数 //填充指标提升个数
if(indReportData.getIndImproveCount()==null) { if(indReportData.getIndImproveCount()==null) {
...@@ -237,6 +238,17 @@ public class IndicatorsReportService { ...@@ -237,6 +238,17 @@ public class IndicatorsReportService {
} }
//提升前三 //提升前三
dataList = this.fillImproveHeadAndAfterCount(resultRank, dataList, 0); dataList = this.fillImproveHeadAndAfterCount(resultRank, dataList, 0);
if("1".equals(growCalType)) {//差比
resultRank = CalculateUtils.rankValue(improveValue, "1");
}else {//差值
if("0".equals(indRule)) {
indRule = "1";
}else {
indRule = "0";
}
resultRank = CalculateUtils.rankValue(improveValue, indRule);
}
//提升末三 //提升末三
dataList = this.fillImproveHeadAndAfterCount(resultRank, dataList, 1); dataList = this.fillImproveHeadAndAfterCount(resultRank, dataList, 1);
} }
......
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