|
|
@@ -161,7 +161,7 @@ public class DeptPortraitServiceImpl implements IDeptPortraitService {
|
|
161
|
161
|
))
|
|
162
|
162
|
.sorted((a, b) -> {
|
|
163
|
163
|
// 按等级排序
|
|
164
|
|
- String[] order = {"等级1", "等级2", "等级3", "等级4", "等级5"};
|
|
|
164
|
+ String[] order = {"一级", "二级", "三级", "四级", "五级"};
|
|
165
|
165
|
return Arrays.asList(order).indexOf(a.getName()) - Arrays.asList(order).indexOf(b.getName());
|
|
166
|
166
|
})
|
|
167
|
167
|
.collect(Collectors.toList());
|
|
|
@@ -265,11 +265,11 @@ public class DeptPortraitServiceImpl implements IDeptPortraitService {
|
|
265
|
265
|
private String decodeQualificationLevelForChart(String v) {
|
|
266
|
266
|
if (v == null) return "未知";
|
|
267
|
267
|
switch (v) {
|
|
268
|
|
- case "LEVEL_ONE": return "等级1";
|
|
269
|
|
- case "LEVEL_TWO": return "等级2";
|
|
270
|
|
- case "LEVEL_THREE": return "等级3";
|
|
271
|
|
- case "LEVEL_FOUR": return "等级4";
|
|
272
|
|
- case "LEVEL_FIVE": return "等级5";
|
|
|
268
|
+ case "LEVEL_ONE": return "一级";
|
|
|
269
|
+ case "LEVEL_TWO": return "二级";
|
|
|
270
|
+ case "LEVEL_THREE": return "三级";
|
|
|
271
|
+ case "LEVEL_FOUR": return "四级";
|
|
|
272
|
+ case "LEVEL_FIVE": return "五级";
|
|
273
|
273
|
default: return v;
|
|
274
|
274
|
}
|
|
275
|
275
|
}
|