WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改OTA待办中心排序

Browse Source
This commit is contained in:
高嵩
2023-09-18 16:46:37 +08:00
parent 5df7920a94
commit 54064404f6
2 changed files with 81 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceiveNsdp.java
+9
View File
@@ -104,4 +104,13 @@ public class OtaManageReceiveNsdp implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String market; private String market;
@TableField(exist = false)
@ApiModelProperty(value = "表头排序字段")
private java.lang.String orderByField;
@TableField(exist = false)
@ApiModelProperty(value = "排序")
private java.lang.String orderBy;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+72
View File
@@ -2344,6 +2344,78 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
} }
} }
} }
if (!resList.isEmpty()) {
//表头排序
headSort(otaManageReceiveNsdp,resList);
}
return resList; return resList;
} }
private void headSort(OtaManageReceiveNsdp otaManageReceiveNsdp, List<OtaManageReceiveNsdp> resList) {
Collator comparator = Collator.getInstance(Locale.CHINESE);
// 软件版本，
if ("releaseName".equals(otaManageReceiveNsdp.getOrderByField())) {
if (OrderEnum.POSITIVE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
Collections.sort(resList, (e1, e2) -> {
String e1ReleaseName = StringUtils.isNotBlank(e1.getReleaseName()) ? e1.getReleaseName() : "";
String e2ReleaseName = StringUtils.isNotBlank(e2.getReleaseName()) ? e2.getReleaseName() : "";
return comparator.compare(e1ReleaseName, e2ReleaseName);
});
} else if (OrderEnum.REVERSE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
Collections.sort(resList, (e1, e2) -> {
String e1ReleaseName = StringUtils.isNotBlank(e1.getReleaseName()) ? e1.getReleaseName() : "";
String e2ReleaseName = StringUtils.isNotBlank(e2.getReleaseName()) ? e2.getReleaseName() : "";
return comparator.compare(e2ReleaseName, e1ReleaseName);
});
}
}
// 发布类型
if ("releaseType".equals(otaManageReceiveNsdp.getOrderByField())) {
if (OrderEnum.POSITIVE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
Collections.sort(resList, (e1, e2) -> {
String e1ReleaseType = StringUtils.isNotBlank(e1.getReleaseType()) ? e1.getReleaseType() : "";
String e2ReleaseType = StringUtils.isNotBlank(e2.getReleaseType()) ? e2.getReleaseType() : "";
return comparator.compare(e1ReleaseType, e2ReleaseType);
});
} else if (OrderEnum.REVERSE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
Collections.sort(resList, (e1, e2) -> {
String e1ReleaseType = StringUtils.isNotBlank(e1.getReleaseType()) ? e1.getReleaseType() : "";
String e2ReleaseType = StringUtils.isNotBlank(e2.getReleaseType()) ? e2.getReleaseType() : "";
return comparator.compare(e2ReleaseType, e1ReleaseType);
});
}
}
// 适用车型，
if ("vehicle".equals(otaManageReceiveNsdp.getOrderByField())) {
if (OrderEnum.POSITIVE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
Collections.sort(resList, (e1, e2) -> {
String e1Vehicle= StringUtils.isNotBlank(e1.getVehicle()) ? e1.getVehicle() : "";
String e2Vehicle= StringUtils.isNotBlank(e2.getVehicle()) ? e2.getVehicle() : "";
return comparator.compare(e1Vehicle, e2Vehicle);
});
} else if (OrderEnum.REVERSE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
Collections.sort(resList, (e1, e2) -> {
String e1Vehicle= StringUtils.isNotBlank(e1.getVehicle()) ? e1.getVehicle() : "";
String e2Vehicle= StringUtils.isNotBlank(e2.getVehicle()) ? e2.getVehicle() : "";
return comparator.compare(e2Vehicle, e1Vehicle);
});
}
}
// 软件发布时间，
if ("releaseDate".equals(otaManageReceiveNsdp.getOrderByField())) {
if (OrderEnum.POSITIVE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
Collections.sort(resList, (e1, e2) -> {
String e1ReleaseDate = StringUtils.isNotBlank(e1.getReleaseDate()) ? e1.getReleaseDate() : "";
String e2ReleaseDate = StringUtils.isNotBlank(e2.getReleaseDate()) ? e2.getReleaseDate() : "";
return comparator.compare(e1ReleaseDate, e2ReleaseDate);
});
} else if (OrderEnum.REVERSE.getValue().equals(otaManageReceiveNsdp.getOrderBy())) {
Collections.sort(resList, (e1, e2) -> {
String e1ReleaseDate = StringUtils.isNotBlank(e1.getReleaseDate()) ? e1.getReleaseDate() : "";
String e2ReleaseDate = StringUtils.isNotBlank(e2.getReleaseDate()) ? e2.getReleaseDate() : "";
return comparator.compare(e2ReleaseDate, e1ReleaseDate);
});
}
}
}
} }