平台件-表头排序
This commit is contained in:
+61
-28
@@ -1109,54 +1109,87 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void hearSort(Map<String, Object> params, List<ProjectLibraryBase> resultLast) {
|
private void hearSort(Map<String, Object> params, List<ProjectLibraryBase> resultList) {
|
||||||
if(ObjectUtils.isNotEmpty(params.get("orderByField"))){
|
if(ObjectUtils.isNotEmpty(params.get("orderByField"))){
|
||||||
Collator comparator = Collator.getInstance(Locale.CHINESE);
|
Collator comparator = Collator.getInstance(Locale.CHINESE);
|
||||||
//项目名称,R&H Studio,车型平台,数字平台
|
//项目名称,R&H Studio,车型平台,数字平台
|
||||||
if("projectName".equals(params.get("orderByField"))){
|
if("projectNameId".equals(params.get("orderByField"))){
|
||||||
if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
|
if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
|
||||||
Collections.sort(resultLast,(e1, e2)->{
|
Collections.sort(resultList,(e1, e2)->{
|
||||||
return comparator.compare(e1.getProjectName(),e2.getProjectName());
|
String e1Field = StringUtils.isNotBlank(e1.getProjectNameId()) ? e1.getProjectNameId() : "";
|
||||||
|
String e2Field = StringUtils.isNotBlank(e2.getProjectNameId()) ? e2.getProjectNameId() : "";
|
||||||
|
return comparator.compare(e1Field,e2Field);
|
||||||
});
|
});
|
||||||
}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
|
}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
|
||||||
Collections.sort(resultLast,(e1,e2)->{
|
Collections.sort(resultList,(e1,e2)->{
|
||||||
return comparator.compare(e2.getProjectName(),e1.getProjectName());
|
String e1Field = StringUtils.isNotBlank(e1.getProjectNameId()) ? e1.getProjectNameId() : "";
|
||||||
|
String e2Field = StringUtils.isNotBlank(e2.getProjectNameId()) ? e2.getProjectNameId() : "";
|
||||||
|
return comparator.compare(e2Field,e1Field);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//R&H Studio
|
//法规工程师
|
||||||
if("studioEngineerName".equals(params.get("orderByField"))){
|
if("createBy".equals(params.get("orderByField"))){
|
||||||
if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
|
if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
|
||||||
Collections.sort(resultLast,(e1, e2)->{
|
Collections.sort(resultList,(e1, e2)->{
|
||||||
return comparator.compare(e1.getStudioEngineerName(),e2.getStudioEngineerName());
|
String e1Field = StringUtils.isNotBlank(e1.getCreateBy()) ? e1.getCreateBy() : "";
|
||||||
|
String e2Field = StringUtils.isNotBlank(e2.getCreateBy()) ? e2.getCreateBy() : "";
|
||||||
|
return comparator.compare(e1Field,e2Field);
|
||||||
});
|
});
|
||||||
}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
|
}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
|
||||||
Collections.sort(resultLast,(e1,e2)->{
|
Collections.sort(resultList,(e1,e2)->{
|
||||||
return comparator.compare(e2.getStudioEngineerName(),e1.getStudioEngineerName());
|
String e1Field = StringUtils.isNotBlank(e1.getCreateBy()) ? e1.getCreateBy() : "";
|
||||||
|
String e2Field = StringUtils.isNotBlank(e2.getCreateBy()) ? e2.getCreateBy() : "";
|
||||||
|
return comparator.compare(e2Field,e1Field);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//车型平台
|
//品牌
|
||||||
if("vehiclePlatform".equals(params.get("orderByField"))){
|
if ("brandText".equals(params.get("orderByField"))) {
|
||||||
if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
|
if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
|
||||||
Collections.sort(resultLast,(e1, e2)->{
|
Collections.sort(resultList, (e1, e2) -> {
|
||||||
return comparator.compare(e1.getVehiclePlatform(),e2.getVehiclePlatform());
|
String e1Field = StringUtils.isNotBlank(e1.getBrandText()) ? e1.getBrandText() : "";
|
||||||
|
String e2Field = StringUtils.isNotBlank(e2.getBrandText()) ? e2.getBrandText() : "";
|
||||||
|
return comparator.compare(e1Field, e2Field);
|
||||||
});
|
});
|
||||||
}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
|
} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
|
||||||
Collections.sort(resultLast,(e1,e2)->{
|
Collections.sort(resultList, (e1, e2) -> {
|
||||||
return comparator.compare(e2.getVehiclePlatform(),e1.getVehiclePlatform());
|
String e1Field = StringUtils.isNotBlank(e1.getBrandText()) ? e1.getBrandText() : "";
|
||||||
|
String e2Field = StringUtils.isNotBlank(e2.getBrandText()) ? e2.getBrandText() : "";
|
||||||
|
return comparator.compare(e2Field, e1Field);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//数字平台
|
|
||||||
if("digitalPlatform".equals(params.get("orderByField"))){
|
//配置项
|
||||||
if(OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))){
|
if ("ipdInfo".equals(params.get("orderByField"))) {
|
||||||
Collections.sort(resultLast,(e1, e2)->{
|
if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
|
||||||
return comparator.compare(e1.getDigitalPlatform(),e2.getDigitalPlatform());
|
Collections.sort(resultList, (e1, e2) -> {
|
||||||
|
String e1Field = StringUtils.isNotBlank(e1.getIpdInfo()) ? e1.getIpdInfo() : "";
|
||||||
|
String e2Field = StringUtils.isNotBlank(e2.getIpdInfo()) ? e2.getIpdInfo() : "";
|
||||||
|
return comparator.compare(e1Field, e2Field);
|
||||||
});
|
});
|
||||||
}else if(OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))){
|
} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
|
||||||
Collections.sort(resultLast,(e1,e2)->{
|
Collections.sort(resultList, (e1, e2) -> {
|
||||||
return comparator.compare(e2.getDigitalPlatform(),e1.getDigitalPlatform());
|
String e1Field = StringUtils.isNotBlank(e1.getIpdInfo()) ? e1.getIpdInfo() : "";
|
||||||
|
String e2Field = StringUtils.isNotBlank(e2.getIpdInfo()) ? e2.getIpdInfo() : "";
|
||||||
|
return comparator.compare(e2Field, e1Field);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//说明
|
||||||
|
if ("explanation".equals(params.get("orderByField"))) {
|
||||||
|
if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
|
||||||
|
Collections.sort(resultList, (e1, e2) -> {
|
||||||
|
String e1Field = StringUtils.isNotBlank(e1.getExplanation()) ? e1.getExplanation() : "";
|
||||||
|
String e2Field = StringUtils.isNotBlank(e2.getExplanation()) ? e2.getExplanation() : "";
|
||||||
|
return comparator.compare(e1Field, e2Field);
|
||||||
|
});
|
||||||
|
} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
|
||||||
|
Collections.sort(resultList, (e1, e2) -> {
|
||||||
|
String e1Field = StringUtils.isNotBlank(e1.getExplanation()) ? e1.getExplanation() : "";
|
||||||
|
String e2Field = StringUtils.isNotBlank(e2.getExplanation()) ? e2.getExplanation() : "";
|
||||||
|
return comparator.compare(e2Field, e1Field);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user