Commit bfae4bf6 by hzc

bug修改

parent c51aa27e
package com.keymobile.indicators.service.report; package com.keymobile.indicators.service.report;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import com.keymobile.indicators.model.entity.report.IndicatorsReportFour; import com.keymobile.indicators.model.entity.report.IndicatorsReportFour;
import com.keymobile.indicators.model.mapper.report.IndicatorsReportFourMapper; import com.keymobile.indicators.model.mapper.report.IndicatorsReportFourMapper;
...@@ -989,18 +985,22 @@ public class IndicatorsReportService { ...@@ -989,18 +985,22 @@ public class IndicatorsReportService {
resultRank = (Map<String,Integer>)objSortRank.get("rankMap"); resultRank = (Map<String,Integer>)objSortRank.get("rankMap");
end = Integer.parseInt(objSortRank.get("rankNum").toString()); end = Integer.parseInt(objSortRank.get("rankNum").toString());
Map.Entry<String, Integer> next = resultRank.entrySet().iterator().next();
int lastOne = next.getValue();
int lastTwo = lastOne-1;
int lastTree = lastTwo-1;
log.info("lastOne:{},lastTwo:{},lastThree:{}",lastOne,lastTwo,lastTree);
for(Map.Entry<String,Integer> entry : resultRank.entrySet()) { for(Map.Entry<String,Integer> entry : resultRank.entrySet()) {
sameImproveAfterThree.append(entry.getKey()).append(";"); sameImproveAfterThree.append(entry.getKey()).append(";");
sameImproveAfterThreeDesc.append(compareObjMapper.get(entry.getKey())).append(";"); sameImproveAfterThreeDesc.append(compareObjMapper.get(entry.getKey())).append(";");
if(entry.getValue()!=null&&entry.getValue()==1){ if(entry.getValue()!=null&&entry.getValue()==lastOne){
sameImproveLastOne.append(entry.getKey()).append(";"); sameImproveLastOne.append(entry.getKey()).append(";");
sameImproveLastOneDesc.append(compareObjMapper.get(entry.getKey())).append(";"); sameImproveLastOneDesc.append(compareObjMapper.get(entry.getKey())).append(";");
}else if(entry.getValue()!=null&&entry.getValue()==2){ }else if(entry.getValue()!=null&&entry.getValue()==lastTwo){
sameImproveLastTwo.append(entry.getKey()).append(";"); sameImproveLastTwo.append(entry.getKey()).append(";");
sameImproveLastTwoDesc.append(compareObjMapper.get(entry.getKey())).append(";"); sameImproveLastTwoDesc.append(compareObjMapper.get(entry.getKey())).append(";");
}else if(entry.getValue()!=null&&entry.getValue()==3){ }else if(entry.getValue()!=null&&entry.getValue()==lastTree){
sameImproveLastThree.append(entry.getKey()).append(";"); sameImproveLastThree.append(entry.getKey()).append(";");
sameImproveLastThreeDesc.append(compareObjMapper.get(entry.getKey())).append(";"); sameImproveLastThreeDesc.append(compareObjMapper.get(entry.getKey())).append(";");
} }
......
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