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

表头排序

Browse Source
This commit is contained in:
zhn
2023-08-21 15:14:29 +08:00
parent 455e447f3e
commit e7f6960595
1 changed files with 18 additions and 36 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/service/impl/OtaManageApplyEOServiceImpl.java
+18 -36
View File
@@ -457,21 +457,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
if("attestationStartTime".equals(otaManageApplyEO.getOrderByField())){ if("attestationStartTime".equals(otaManageApplyEO.getOrderByField())){
if (OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())) { if (OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())) {
Collections.sort(otaManageApplyEOList, (e1, e2) -> { Collections.sort(otaManageApplyEOList, (e1, e2) -> {
if (e1.getAttestationStartTime() != null && e2.getAttestationStartTime() != null) { String e1AttestationStartTime = ObjectUtils.isNotEmpty(e1.getAttestationStartTime()) ? DateUtils.formatDate(e1.getAttestationStartTime()) : "";
String e1AttestationStartTime = DateUtils.formatDate(e1.getAttestationStartTime()); String e2AttestationStartTime = ObjectUtils.isNotEmpty(e2.getAttestationStartTime()) ? DateUtils.formatDate(e2.getAttestationStartTime()) : "";
String e2AttestationStartTime = DateUtils.formatDate(e2.getAttestationStartTime()); return comparator.compare(e1AttestationStartTime, e2AttestationStartTime);
return comparator.compare(e1AttestationStartTime, e2AttestationStartTime);
}
return -1;
}); });
} else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) { } else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) {
Collections.sort(otaManageApplyEOList, (e1, e2) -> { Collections.sort(otaManageApplyEOList, (e1, e2) -> {
if (e1.getAttestationStartTime() != null && e2.getAttestationStartTime() != null) { String e1AttestationStartTime = ObjectUtils.isNotEmpty(e1.getAttestationStartTime()) ? DateUtils.formatDate(e1.getAttestationStartTime()) : "";
String e1AttestationStartTime = DateUtils.formatDate(e1.getAttestationStartTime()); String e2AttestationStartTime = ObjectUtils.isNotEmpty(e2.getAttestationStartTime()) ? DateUtils.formatDate(e2.getAttestationStartTime()) : "";
String e2AttestationStartTime = DateUtils.formatDate(e2.getAttestationStartTime()); return comparator.compare(e2AttestationStartTime, e1AttestationStartTime);
return comparator.compare(e2AttestationStartTime, e1AttestationStartTime);
}
return -1;
}); });
} }
} }
@@ -479,21 +473,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
if("certificationSubmission".equals(otaManageApplyEO.getOrderByField())){ if("certificationSubmission".equals(otaManageApplyEO.getOrderByField())){
if (OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())) { if (OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())) {
Collections.sort(otaManageApplyEOList, (e1, e2) -> { Collections.sort(otaManageApplyEOList, (e1, e2) -> {
if (e1.getCertificationSubmission() != null && e2.getCertificationSubmission() != null) { String e1CertificationSubmission = ObjectUtils.isNotEmpty(e1.getCertificationSubmission()) ? DateUtils.formatDate(e1.getCertificationSubmission()) : "";
String e1CertificationSubmission = DateUtils.formatDate(e1.getCertificationSubmission()); String e2CertificationSubmission = ObjectUtils.isNotEmpty(e2.getCertificationSubmission()) ? DateUtils.formatDate(e2.getCertificationSubmission()) : "";
String e2CertificationSubmission = DateUtils.formatDate(e2.getCertificationSubmission()); return comparator.compare(e1CertificationSubmission, e2CertificationSubmission);
return comparator.compare(e1CertificationSubmission, e2CertificationSubmission);
}
return -1;
}); });
} else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) { } else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) {
Collections.sort(otaManageApplyEOList, (e1, e2) -> { Collections.sort(otaManageApplyEOList, (e1, e2) -> {
if (e1.getCertificationSubmission() != null && e2.getCertificationSubmission() != null) { String e1CertificationSubmission = ObjectUtils.isNotEmpty(e1.getCertificationSubmission()) ? DateUtils.formatDate(e1.getCertificationSubmission()) : "";
String e1CertificationSubmission = DateUtils.formatDate(e1.getCertificationSubmission()); String e2CertificationSubmission = ObjectUtils.isNotEmpty(e2.getCertificationSubmission()) ? DateUtils.formatDate(e2.getCertificationSubmission()) : "";
String e2CertificationSubmission = DateUtils.formatDate(e2.getCertificationSubmission()); return comparator.compare(e2CertificationSubmission, e1CertificationSubmission);
return comparator.compare(e2CertificationSubmission, e1CertificationSubmission);
}
return -1;
}); });
} }
} }
@@ -501,21 +489,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
if("attestationEndTime".equals(otaManageApplyEO.getOrderByField())){ if("attestationEndTime".equals(otaManageApplyEO.getOrderByField())){
if (OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())) { if (OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())) {
Collections.sort(otaManageApplyEOList, (e1, e2) -> { Collections.sort(otaManageApplyEOList, (e1, e2) -> {
if (e1.getAttestationEndTime() != null && e2.getAttestationEndTime() != null) { String e1AttestationEndTime = ObjectUtils.isNotEmpty(e1.getAttestationEndTime()) ? DateUtils.formatDate(e1.getAttestationEndTime()) : "";
String e1AttestationEndTime = DateUtils.formatDate(e1.getAttestationEndTime()); String e2AttestationEndTime = ObjectUtils.isNotEmpty(e2.getAttestationEndTime()) ? DateUtils.formatDate(e2.getAttestationEndTime()) : "";
String e2AttestationEndTime = DateUtils.formatDate(e2.getAttestationEndTime()); return comparator.compare(e1AttestationEndTime, e2AttestationEndTime);
return comparator.compare(e1AttestationEndTime, e2AttestationEndTime);
}
return -1;
}); });
} else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) { } else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) {
Collections.sort(otaManageApplyEOList, (e1, e2) -> { Collections.sort(otaManageApplyEOList, (e1, e2) -> {
if (e1.getAttestationEndTime() != null && e2.getAttestationEndTime() != null) { String e1AttestationEndTime = ObjectUtils.isNotEmpty(e1.getAttestationEndTime()) ? DateUtils.formatDate(e1.getAttestationEndTime()) : "";
String e1AttestationEndTime = DateUtils.formatDate(e1.getAttestationEndTime()); String e2AttestationEndTime = ObjectUtils.isNotEmpty(e2.getAttestationEndTime()) ? DateUtils.formatDate(e2.getAttestationEndTime()) : "";
String e2AttestationEndTime = DateUtils.formatDate(e2.getAttestationEndTime()); return comparator.compare(e2AttestationEndTime, e1AttestationEndTime);
return comparator.compare(e2AttestationEndTime, e1AttestationEndTime);
}
return -1;
}); });
} }
} }