|
|
@@ -63,18 +63,20 @@ public class UniversitiesCondDTO {
|
|
|
|
|
|
private Boolean filterRank;
|
|
|
|
|
|
- public Map toCondMap(Integer year, String entranceType, Integer examMajor, String rankLocation,Integer tier) {
|
|
|
+ public Map toCondMap(Integer year, String entranceType, Integer examMajor, String rankLocation,String tiers) {
|
|
|
Map cond = Maps.newHashMap();
|
|
|
cond.put("code", code);
|
|
|
cond.put("name", name);
|
|
|
cond.put("managerType", managerType);
|
|
|
cond.put("majorCategory", majorCategory);
|
|
|
cond.put("year", year);
|
|
|
- cond.put("tier", tier);
|
|
|
cond.put("rankLocation", StringUtils.trimToEmpty(rankLocation));
|
|
|
if (StringUtils.isNotBlank(location)) {
|
|
|
cond.put("locations", Arrays.asList(location.split(",")));
|
|
|
}
|
|
|
+ if (StringUtils.isNotBlank(tiers)) {
|
|
|
+ cond.put("tiers", Arrays.asList(tiers.split(",")));
|
|
|
+ }
|
|
|
if(StringUtils.isNotBlank(natureTypeCN)) {
|
|
|
cond.put("natureTypeCNs", Arrays.asList(natureTypeCN.split(",")));
|
|
|
}
|