修改报表2获取具体末三判断逻辑

src/main/java/com/keymobile/indicators/service/report/IndicatorsReportService.java

@@ -853,15 +853,15 @@ public class IndicatorsReportService {
 				rankAfterThree.append(entry.getKey()).append(";");
 				rankAfterThreeDesc.append(objDescMap.get(entry.getKey())).append(";");
 				//author:zhangkb  time:2020-9-16  desc:填充具体末名次单位
-				if(entry.getValue()!=null && entry.getValue()==1) {
+				if(entry.getValue()!=null && (rankMap.size()-entry.getValue()+1)==1) {
 					rankLastOne.append(entry.getKey()).append(";");
 					rankLastOneDesc.append(objDescMap.get(entry.getKey())).append(";");
 				}
-				if(entry.getValue()!=null && entry.getValue()==2) {
+				if(entry.getValue()!=null && (rankMap.size()-entry.getValue()+1)==2) {
 					rankLastTwo.append(entry.getKey()).append(";");
 					rankLastTwoDesc.append(objDescMap.get(entry.getKey())).append(";");
 				}
-				if(entry.getValue()!=null && entry.getValue()==3) {
+				if(entry.getValue()!=null && (rankMap.size()-entry.getValue()+1)==3) {
 					rankLastThree.append(entry.getKey()).append(";");
 					rankLastThreeDesc.append(objDescMap.get(entry.getKey())).append(";");
 				}

src/main/java/com/keymobile/indicators/utils/CalculateUtils.java

@@ -366,51 +366,20 @@ public class CalculateUtils {
     }
 
 	public static void main(String[] args) {
-		Map<String,String> map = new HashMap<>();
-		map.put("4302", "48.0000");
-		map.put("4308", "24.0000");
-		map.put("4304", "24.0000");
-		map.put("4310", "43.9100");
-		map.put("4331", "48.0000");
-		map.put("4312", "48.0000");
-		map.put("4313", "24.0000");
-		map.put("4303", "39.8400");
-		map.put("4309", "48.0000");
-		map.put("4307", "48.0000");
-		map.put("4301", "48.0000");
-		map.put("4306", "48.0000");
-		map.put("4305", "48.0000");
-		map.put("4311", "39.8400");
-		CalculateUtils cal = new CalculateUtils();
-//		System.out.println(cal.isValidformula("([1001]+[1002])-[1004]"));
-		Map<String,Integer> result = cal.rankValue(map, "1");
-		result = cal.sortMapByValue(result,1);
-		System.out.println(result);
-//		
-//		String formula = "([1001]+[1002])/2";
-//		Map<String,String> map = new HashMap<>();
-//		map.put("1001", "3");
-//		map.put("1002", "5");
-//		formula = formula.replace("[1001]", "3");
-//		formula = formula.replace("[1002]", "5");
-		String ss = "1755";
-		String formula = "(ss/2299-1)*100";
-		if(ss.indexOf(".")<0) {
-			ss += ".00";
-		}
-		formula = formula.replace("ss", ss);
-		String result1 = AviatorEvaluator.execute(formula).toString();
-//		String result2 = cal.calculateFormula(formula, map);
-		System.out.println(result1);
-//		System.out.println(result2);
-//		Double b = (double) Math.abs(34-50);
-//		System.out.println(b);
-//		List<String> listA = new ArrayList<>();
-//		listA.add("a");
-//		listA.add("b");
-//		listA.add("c");
-//		List<String> listB = new ArrayList<>();
-//		listA.retainAll(listB);
-//		System.out.println(listA);
+		Map<String,Integer> objSort = new HashMap<>();
+		objSort.put("4301",1);objSort.put("4302",2);objSort.put("4303",3);
+		objSort.put("4304",4);objSort.put("4305",5);objSort.put("4306",6);
+		objSort.put("4307",7);objSort.put("4308",8);objSort.put("4309",9);
+		objSort.put("4310",10);objSort.put("4311",11);objSort.put("4312",12);
+		objSort.put("4313",13);objSort.put("4331",14);
+		Map<String,Integer> map = new HashMap<>();
+		map.put("430402", 4);
+		map.put("430405", 2);
+		map.put("430404", 5);
+		map.put("430407", 3);
+		map.put("430409", 1);
+		map = CalculateUtils.sortMapByValue(map,1);//按照value从大到小排序
+		Map<String,Object> resultRankMap = CalculateUtils.rankByObjSort(map, objSort);
+		System.out.println(resultRankMap);
 	}
 }