|
|
@ -2874,7 +2874,7 @@ public class StatisticsAllService extends BaseService {
|
|
|
|
|
|
String low_level = String.valueOf(StringUtils.isEmpty(lowLevel) ? (level - 1) : lowLevel);
|
|
|
List<Map<String, Object>> resultList = new ArrayList<>();//续签量
|
|
|
//获取续签量
|
|
|
//从redis获取续签量列表 团队，机构 区的续签量根据index来区分
|
|
|
JSONArray renewJA = getLevel2ListForRedis(index, level + "", lowLevel, area, timeKey);
|
|
|
|
|
|
//续签的的列表转map
|
|
|
@ -2899,7 +2899,7 @@ public class StatisticsAllService extends BaseService {
|
|
|
int signNum = 0;
|
|
|
int renewNum = renewMap.get(map.get("code").toString());
|
|
|
signNum = Integer.valueOf(0);
|
|
|
map.put("rate", getRange(renewNum, signNum, 2));
|
|
|
map.put("rate", getRange(renewNum, signNum, 2));//续签率是 续签量/去年的签约数
|
|
|
map.put("signNum", 0);
|
|
|
map.put("renewNum", renewNum);
|
|
|
} else {
|
|
|
@ -2908,7 +2908,7 @@ public class StatisticsAllService extends BaseService {
|
|
|
int signNum = 0;
|
|
|
int renewNum = renewMap.get(map.get("code").toString());
|
|
|
signNum = Integer.valueOf(redisNum.getResult());
|
|
|
map.put("rate", getRange(renewNum, signNum, 2));
|
|
|
map.put("rate", getRange(renewNum, signNum, 2));//续签率是 续签量/去年的签约数
|
|
|
map.put("signNum", signNum);
|
|
|
map.put("renewNum", renewNum);
|
|
|
}
|
|
|
@ -2918,7 +2918,7 @@ public class StatisticsAllService extends BaseService {
|
|
|
if ((level == 4 && "1".equals(lowLevel)) || (level == 2) || (level == 3 && "1".equals(lowLevel))) {
|
|
|
translateTeamLeaderName(resultList);
|
|
|
}
|
|
|
|
|
|
//对结果进行排序
|
|
|
Collections.sort(resultList, new Comparator<Map<String, Object>>() {
|
|
|
public int compare(Map<String, Object> o1, Map<String, Object> o2) {
|
|
|
long map1value = (long) o1.get("amount");
|
