From 287b00f1a549b1e5fa097dd9de4d678e4e1cd82c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 21 Aug 2023 11:26:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?OTA-=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ota/entity/OtaManageApplyEO.java | 8 + .../impl/OtaManageApplyEOServiceImpl.java | 333 ++++++++++++++++++ 2 files changed, 341 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java index 3cf296803..af9179588 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageApplyEO.java @@ -194,5 +194,13 @@ public class OtaManageApplyEO implements Serializable { @TableField(exist = false) private boolean disabled; + @TableField(exist = false) + @ApiModelProperty(value = "表头排序字段") + private java.lang.String orderByField; + + @TableField(exist = false) + @ApiModelProperty(value = "排序") + private java.lang.String orderBy; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index 765c8b5b2..e457b0f5b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.DateUtils; import com.jero.common.util.PageUtil; +import com.jero.modules.dummy.enums.OrderEnum; import com.jero.modules.ota.entity.OtaManageApplyEO; import com.jero.modules.ota.entity.OtaManageReceiveNsdpEO; import com.jero.modules.ota.enums.OtaCarEnum; @@ -35,6 +37,7 @@ import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.Collator; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -216,10 +219,340 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl otaManageApplyEOList) { + Collator comparator = Collator.getInstance(Locale.CHINESE); + // 软件版本， + if("plannedBpLaunchBatch".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1PlannedBpLaunchBatch = StringUtils.isNotBlank(e1.getPlannedBpLaunchBatch()) ? e1.getPlannedBpLaunchBatch() : ""; + String e2PlannedBpLaunchBatch = StringUtils.isNotBlank(e2.getPlannedBpLaunchBatch()) ? e2.getPlannedBpLaunchBatch() : ""; + return comparator.compare(e1PlannedBpLaunchBatch,e2PlannedBpLaunchBatch); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1PlannedBpLaunchBatch = StringUtils.isNotBlank(e1.getPlannedBpLaunchBatch()) ? e1.getPlannedBpLaunchBatch() : ""; + String e2PlannedBpLaunchBatch = StringUtils.isNotBlank(e2.getPlannedBpLaunchBatch()) ? e2.getPlannedBpLaunchBatch() : ""; + return comparator.compare(e2PlannedBpLaunchBatch,e1PlannedBpLaunchBatch); + }); + } + } + // 市场， + if("market".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1Market = StringUtils.isNotBlank(e1.getMarket()) ? e1.getMarket() : ""; + String e2Market = StringUtils.isNotBlank(e2.getMarket()) ? e2.getMarket() : ""; + return comparator.compare(e1Market,e2Market); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1Market = StringUtils.isNotBlank(e1.getMarket()) ? e1.getMarket() : ""; + String e2Market = StringUtils.isNotBlank(e2.getMarket()) ? e2.getMarket() : ""; + return comparator.compare(e2Market,e1Market); + }); + } + } + // 适用车型， + if("appliedVehicleProject".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1AppliedVehicleProject = StringUtils.isNotBlank(e1.getAppliedVehicleProject()) ? e1.getAppliedVehicleProject() : ""; + String e2AppliedVehicleProject = StringUtils.isNotBlank(e2.getAppliedVehicleProject()) ? e2.getAppliedVehicleProject() : ""; + return comparator.compare(e1AppliedVehicleProject,e2AppliedVehicleProject); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1AppliedVehicleProject = StringUtils.isNotBlank(e1.getAppliedVehicleProject()) ? e1.getAppliedVehicleProject() : ""; + String e2AppliedVehicleProject = StringUtils.isNotBlank(e2.getAppliedVehicleProject()) ? e2.getAppliedVehicleProject() : ""; + return comparator.compare(e2AppliedVehicleProject,e1AppliedVehicleProject); + }); + } + } + // 软件发布时间， + if("releaseName".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(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(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1ReleaseName = StringUtils.isNotBlank(e1.getReleaseName()) ? e1.getReleaseName() : ""; + String e2ReleaseName = StringUtils.isNotBlank(e2.getReleaseName()) ? e2.getReleaseName() : ""; + return comparator.compare(e2ReleaseName,e1ReleaseName); + }); + } + } + //VDR + if("vdr".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1Vdr = StringUtils.isNotBlank(e1.getVdr()) ? e1.getVdr() : ""; + String e2Vdr = StringUtils.isNotBlank(e2.getVdr()) ? e2.getVdr() : ""; + return comparator.compare(e1Vdr,e2Vdr); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1Vdr = StringUtils.isNotBlank(e1.getVdr()) ? e1.getVdr() : ""; + String e2Vdr = StringUtils.isNotBlank(e2.getVdr()) ? e2.getVdr() : ""; + return comparator.compare(e2Vdr,e1Vdr); + }); + } + } + //主题 + if("summary".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1Summary = StringUtils.isNotBlank(e1.getSummary()) ? e1.getSummary() : ""; + String e2Summary = StringUtils.isNotBlank(e2.getSummary()) ? e2.getSummary() : ""; + return comparator.compare(e1Summary,e2Summary); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1Summary = StringUtils.isNotBlank(e1.getSummary()) ? e1.getSummary() : ""; + String e2Summary = StringUtils.isNotBlank(e2.getSummary()) ? e2.getSummary() : ""; + return comparator.compare(e2Summary,e1Summary); + }); + } + } + //VDR状态 + if("status".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1Status = StringUtils.isNotBlank(e1.getStatus()) ? e1.getStatus() : ""; + String e2Status = StringUtils.isNotBlank(e2.getStatus()) ? e2.getStatus() : ""; + return comparator.compare(e1Status,e2Status); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1Status = StringUtils.isNotBlank(e1.getStatus()) ? e1.getStatus() : ""; + String e2Status = StringUtils.isNotBlank(e2.getStatus()) ? e2.getStatus() : ""; + return comparator.compare(e2Status,e1Status); + }); + } + } + //认证影响 + if("homologationImpact".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1HomologationImpact = StringUtils.isNotBlank(e1.getHomologationImpact()) ? e1.getHomologationImpact() : ""; + String e2HomologationImpact = StringUtils.isNotBlank(e2.getHomologationImpact()) ? e2.getHomologationImpact() : ""; + return comparator.compare(e1HomologationImpact,e2HomologationImpact); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1HomologationImpact = StringUtils.isNotBlank(e1.getHomologationImpact()) ? e1.getHomologationImpact() : ""; + String e2HomologationImpact = StringUtils.isNotBlank(e2.getHomologationImpact()) ? e2.getHomologationImpact() : ""; + return comparator.compare(e2HomologationImpact,e1HomologationImpact); + }); + } + } + //影响描述， + if("homologation".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1Homologation = StringUtils.isNotBlank(e1.getHomologation()) ? e1.getHomologation() : ""; + String e2Homologation = StringUtils.isNotBlank(e2.getHomologation()) ? e2.getHomologation() : ""; + return comparator.compare(e1Homologation,e2Homologation); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1Homologation = StringUtils.isNotBlank(e1.getHomologation()) ? e1.getHomologation() : ""; + String e2Homologation = StringUtils.isNotBlank(e2.getHomologation()) ? e2.getHomologation() : ""; + return comparator.compare(e2Homologation,e1Homologation); + }); + } + } + //影响法规-cn， + if("impactCnHomo".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1ImpactCnHomo = StringUtils.isNotBlank(e1.getImpactCnHomo()) ? e1.getImpactCnHomo() : ""; + String e2ImpactCnHomo = StringUtils.isNotBlank(e2.getImpactCnHomo()) ? e2.getImpactCnHomo() : ""; + return comparator.compare(e1ImpactCnHomo,e2ImpactCnHomo); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1ImpactCnHomo = StringUtils.isNotBlank(e1.getImpactCnHomo()) ? e1.getImpactCnHomo() : ""; + String e2ImpactCnHomo = StringUtils.isNotBlank(e2.getImpactCnHomo()) ? e2.getImpactCnHomo() : ""; + return comparator.compare(e2ImpactCnHomo,e1ImpactCnHomo); + }); + } + } + //影响法规-EU， + if("impactEuHomo".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1ImpactEuHomo = StringUtils.isNotBlank(e1.getImpactEuHomo()) ? e1.getImpactEuHomo() : ""; + String e2ImpactEuHomo = StringUtils.isNotBlank(e2.getImpactEuHomo()) ? e2.getImpactEuHomo() : ""; + return comparator.compare(e1ImpactEuHomo,e2ImpactEuHomo); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1ImpactEuHomo = StringUtils.isNotBlank(e1.getImpactEuHomo()) ? e1.getImpactEuHomo() : ""; + String e2ImpactEuHomo = StringUtils.isNotBlank(e2.getImpactEuHomo()) ? e2.getImpactEuHomo() : ""; + return comparator.compare(e2ImpactEuHomo,e1ImpactEuHomo); + }); + } + } + //责任部门 + if("masterDomain".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1MasterDomain = StringUtils.isNotBlank(e1.getMasterDomain()) ? e1.getMasterDomain() : ""; + String e2MasterDomain = StringUtils.isNotBlank(e2.getMasterDomain()) ? e2.getMasterDomain() : ""; + return comparator.compare(e1MasterDomain,e2MasterDomain); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1MasterDomain = StringUtils.isNotBlank(e1.getMasterDomain()) ? e1.getMasterDomain() : ""; + String e2MasterDomain = StringUtils.isNotBlank(e2.getMasterDomain()) ? e2.getMasterDomain() : ""; + return comparator.compare(e1MasterDomain,e2MasterDomain); + }); + } + } + //studio + if("studio".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1Studio = StringUtils.isNotBlank(e1.getStudio()) ? e1.getStudio() : ""; + String e2Studio = StringUtils.isNotBlank(e2.getStudio()) ? e2.getStudio() : ""; + return comparator.compare(e1Studio,e2Studio); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1Studio = StringUtils.isNotBlank(e1.getStudio()) ? e1.getStudio() : ""; + String e2Studio = StringUtils.isNotBlank(e2.getStudio()) ? e2.getStudio() : ""; + return comparator.compare(e2Studio,e1Studio); + }); + } + } + //认证开始 + if("attestationStartTime".equals(otaManageApplyEO.getOrderByField())){ + if (OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())) { + Collections.sort(otaManageApplyEOList, (e1, e2) -> { + if (e1.getAttestationStartTime() != null && e2.getAttestationStartTime() != null) { + String e1AttestationStartTime = DateUtils.formatDate(e1.getAttestationStartTime()); + String e2AttestationStartTime = DateUtils.formatDate(e2.getAttestationStartTime()); + return comparator.compare(e1AttestationStartTime, e2AttestationStartTime); + } + return -1; + }); + } else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) { + Collections.sort(otaManageApplyEOList, (e1, e2) -> { + if (e1.getAttestationStartTime() != null && e2.getAttestationStartTime() != null) { + String e1AttestationStartTime = DateUtils.formatDate(e1.getAttestationStartTime()); + String e2AttestationStartTime = DateUtils.formatDate(e2.getAttestationStartTime()); + return comparator.compare(e2AttestationStartTime, e1AttestationStartTime); + } + return -1; + }); + } + } + //认证申报 + if("certificationSubmission".equals(otaManageApplyEO.getOrderByField())){ + if (OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())) { + Collections.sort(otaManageApplyEOList, (e1, e2) -> { + if (e1.getCertificationSubmission() != null && e2.getCertificationSubmission() != null) { + String e1CertificationSubmission = DateUtils.formatDate(e1.getCertificationSubmission()); + String e2CertificationSubmission = DateUtils.formatDate(e2.getCertificationSubmission()); + return comparator.compare(e1CertificationSubmission, e2CertificationSubmission); + } + return -1; + }); + } else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) { + Collections.sort(otaManageApplyEOList, (e1, e2) -> { + if (e1.getCertificationSubmission() != null && e2.getCertificationSubmission() != null) { + String e1CertificationSubmission = DateUtils.formatDate(e1.getCertificationSubmission()); + String e2CertificationSubmission = DateUtils.formatDate(e2.getCertificationSubmission()); + return comparator.compare(e2CertificationSubmission, e1CertificationSubmission); + } + return -1; + }); + } + } + //认证批准 + if("attestationEndTime".equals(otaManageApplyEO.getOrderByField())){ + if (OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())) { + Collections.sort(otaManageApplyEOList, (e1, e2) -> { + if (e1.getAttestationEndTime() != null && e2.getAttestationEndTime() != null) { + String e1AttestationEndTime = DateUtils.formatDate(e1.getAttestationEndTime()); + String e2AttestationEndTime = DateUtils.formatDate(e2.getAttestationEndTime()); + return comparator.compare(e1AttestationEndTime, e2AttestationEndTime); + } + return -1; + }); + } else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) { + Collections.sort(otaManageApplyEOList, (e1, e2) -> { + if (e1.getAttestationEndTime() != null && e2.getAttestationEndTime() != null) { + String e1AttestationEndTime = DateUtils.formatDate(e1.getAttestationEndTime()); + String e2AttestationEndTime = DateUtils.formatDate(e2.getAttestationEndTime()); + return comparator.compare(e2AttestationEndTime, e1AttestationEndTime); + } + return -1; + }); + } + } + //认证进度 + if("attestationSchedule".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1AttestationSchedule = StringUtils.isNotBlank(e1.getAttestationSchedule()) ? e1.getAttestationSchedule() : ""; + String e2AttestationSchedule = StringUtils.isNotBlank(e2.getAttestationSchedule()) ? e2.getAttestationSchedule() : ""; + return comparator.compare(e1AttestationSchedule,e2AttestationSchedule); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1AttestationSchedule = StringUtils.isNotBlank(e1.getAttestationSchedule()) ? e1.getAttestationSchedule() : ""; + String e2AttestationSchedule = StringUtils.isNotBlank(e2.getAttestationSchedule()) ? e2.getAttestationSchedule() : ""; + return comparator.compare(e2AttestationSchedule,e1AttestationSchedule); + }); + } + } + //匹配状态 + if("matchStatus".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1MatchStatus = StringUtils.isNotBlank(e1.getMatchStatus()) ? e1.getMatchStatus() : ""; + String e2MatchStatus = StringUtils.isNotBlank(e2.getMatchStatus()) ? e2.getMatchStatus() : ""; + return comparator.compare(e1MatchStatus,e2MatchStatus); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1MatchStatus = StringUtils.isNotBlank(e1.getMatchStatus()) ? e1.getMatchStatus() : ""; + String e2MatchStatus = StringUtils.isNotBlank(e2.getMatchStatus()) ? e2.getMatchStatus() : ""; + return comparator.compare(e2MatchStatus,e1MatchStatus); + }); + } + } + //备注 + if("remark".equals(otaManageApplyEO.getOrderByField())){ + if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1, e2)->{ + String e1Remark = StringUtils.isNotBlank(e1.getRemark()) ? e1.getRemark() : ""; + String e2Remark = StringUtils.isNotBlank(e2.getRemark()) ? e2.getRemark() : ""; + return comparator.compare(e1Remark,e2Remark); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1Remark = StringUtils.isNotBlank(e1.getRemark()) ? e1.getRemark() : ""; + String e2Remark = StringUtils.isNotBlank(e2.getRemark()) ? e2.getRemark() : ""; + return comparator.compare(e2Remark,e1Remark); + }); + } + } + } + /** * 分车型列表-分页列表查询 * @param otaManageApplyEO From 8af763b9c1e925c7e83e584894ebce8b85afbb97 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 21 Aug 2023 13:53:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaManageApplyEOServiceImpl.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index e457b0f5b..c088b58d1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -417,22 +417,22 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl{ String e1MasterDomain = StringUtils.isNotBlank(e1.getMasterDomain()) ? e1.getMasterDomain() : ""; String e2MasterDomain = StringUtils.isNotBlank(e2.getMasterDomain()) ? e2.getMasterDomain() : ""; - return comparator.compare(e1MasterDomain,e2MasterDomain); + return comparator.compare(e2MasterDomain,e1MasterDomain); }); } } //studio - if("studio".equals(otaManageApplyEO.getOrderByField())){ + if("studioText".equals(otaManageApplyEO.getOrderByField())){ if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ Collections.sort(otaManageApplyEOList,(e1, e2)->{ - String e1Studio = StringUtils.isNotBlank(e1.getStudio()) ? e1.getStudio() : ""; - String e2Studio = StringUtils.isNotBlank(e2.getStudio()) ? e2.getStudio() : ""; + String e1Studio = StringUtils.isNotBlank(e1.getStudioText()) ? e1.getStudioText() : ""; + String e2Studio = StringUtils.isNotBlank(e2.getStudioText()) ? e2.getStudioText() : ""; return comparator.compare(e1Studio,e2Studio); }); }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ Collections.sort(otaManageApplyEOList,(e1,e2)->{ - String e1Studio = StringUtils.isNotBlank(e1.getStudio()) ? e1.getStudio() : ""; - String e2Studio = StringUtils.isNotBlank(e2.getStudio()) ? e2.getStudio() : ""; + String e1Studio = StringUtils.isNotBlank(e1.getStudioText()) ? e1.getStudioText() : ""; + String e2Studio = StringUtils.isNotBlank(e2.getStudioText()) ? e2.getStudioText() : ""; return comparator.compare(e2Studio,e1Studio); }); } @@ -520,17 +520,17 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl{ - String e1MatchStatus = StringUtils.isNotBlank(e1.getMatchStatus()) ? e1.getMatchStatus() : ""; - String e2MatchStatus = StringUtils.isNotBlank(e2.getMatchStatus()) ? e2.getMatchStatus() : ""; + String e1MatchStatus = StringUtils.isNotBlank(e1.getMatchStatusText()) ? e1.getMatchStatusText() : ""; + String e2MatchStatus = StringUtils.isNotBlank(e2.getMatchStatusText()) ? e2.getMatchStatusText() : ""; return comparator.compare(e1MatchStatus,e2MatchStatus); }); }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ Collections.sort(otaManageApplyEOList,(e1,e2)->{ - String e1MatchStatus = StringUtils.isNotBlank(e1.getMatchStatus()) ? e1.getMatchStatus() : ""; - String e2MatchStatus = StringUtils.isNotBlank(e2.getMatchStatus()) ? e2.getMatchStatus() : ""; + String e1MatchStatus = StringUtils.isNotBlank(e1.getMatchStatusText()) ? e1.getMatchStatusText() : ""; + String e2MatchStatus = StringUtils.isNotBlank(e2.getMatchStatusText()) ? e2.getMatchStatusText() : ""; return comparator.compare(e2MatchStatus,e1MatchStatus); }); } @@ -668,7 +668,10 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl Date: Mon, 21 Aug 2023 14:23:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F-?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaManageApplyEOServiceImpl.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index c088b58d1..a51b8e89b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -421,6 +421,22 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl{ + String e1ProjectVersionText = StringUtils.isNotBlank(e1.getProjectVersionText()) ? e1.getProjectVersionText() : ""; + String e2ProjectVersionText = StringUtils.isNotBlank(e2.getProjectVersionText()) ? e2.getProjectVersionText() : ""; + return comparator.compare(e1ProjectVersionText,e2ProjectVersionText); + }); + }else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){ + Collections.sort(otaManageApplyEOList,(e1,e2)->{ + String e1ProjectVersionText = StringUtils.isNotBlank(e1.getProjectVersionText()) ? e1.getProjectVersionText() : ""; + String e2ProjectVersionText = StringUtils.isNotBlank(e2.getProjectVersionText()) ? e2.getProjectVersionText() : ""; + return comparator.compare(e2ProjectVersionText,e1ProjectVersionText); + }); + } + } //studio if("studioText".equals(otaManageApplyEO.getOrderByField())){ if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){ @@ -599,6 +615,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl vprojectVersionList = getProjectVersionList(otaManageApplyEO.getAppliedVehicleProject()); //项目版本id List projectVersionList = list.stream() .map(OtaManageApplyEO::getProjectVersion).distinct().collect(Collectors.toList()); @@ -641,6 +658,11 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl collect = vprojectVersionList.stream().filter(e -> e.getProjectId().equals(manageApplyEO.getProjectVersion())).distinct().collect(Collectors.toList()); + if(!collect.isEmpty()){ + manageApplyEO.setProjectVersionText(collect.get(0).getCar()+"-"+collect.get(0).getYearName()+"-"+collect.get(0).getMarket()); + } } manageApplyEO.setDisabled(isDisabled); if(StringUtils.isBlank(manageApplyEO.getRemark())){ From e7f69605957f83648785783e95e13f1d02f21ada Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 21 Aug 2023 15:14:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaManageApplyEOServiceImpl.java | 54 +++++++------------ 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index a51b8e89b..d49d6fcec 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -457,21 +457,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl { - if (e1.getAttestationStartTime() != null && e2.getAttestationStartTime() != null) { - String e1AttestationStartTime = DateUtils.formatDate(e1.getAttestationStartTime()); - String e2AttestationStartTime = DateUtils.formatDate(e2.getAttestationStartTime()); - return comparator.compare(e1AttestationStartTime, e2AttestationStartTime); - } - return -1; + String e1AttestationStartTime = ObjectUtils.isNotEmpty(e1.getAttestationStartTime()) ? DateUtils.formatDate(e1.getAttestationStartTime()) : ""; + String e2AttestationStartTime = ObjectUtils.isNotEmpty(e2.getAttestationStartTime()) ? DateUtils.formatDate(e2.getAttestationStartTime()) : ""; + return comparator.compare(e1AttestationStartTime, e2AttestationStartTime); }); } else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) { Collections.sort(otaManageApplyEOList, (e1, e2) -> { - if (e1.getAttestationStartTime() != null && e2.getAttestationStartTime() != null) { - String e1AttestationStartTime = DateUtils.formatDate(e1.getAttestationStartTime()); - String e2AttestationStartTime = DateUtils.formatDate(e2.getAttestationStartTime()); - return comparator.compare(e2AttestationStartTime, e1AttestationStartTime); - } - return -1; + String e1AttestationStartTime = ObjectUtils.isNotEmpty(e1.getAttestationStartTime()) ? DateUtils.formatDate(e1.getAttestationStartTime()) : ""; + String e2AttestationStartTime = ObjectUtils.isNotEmpty(e2.getAttestationStartTime()) ? DateUtils.formatDate(e2.getAttestationStartTime()) : ""; + return comparator.compare(e2AttestationStartTime, e1AttestationStartTime); }); } } @@ -479,21 +473,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl { - if (e1.getCertificationSubmission() != null && e2.getCertificationSubmission() != null) { - String e1CertificationSubmission = DateUtils.formatDate(e1.getCertificationSubmission()); - String e2CertificationSubmission = DateUtils.formatDate(e2.getCertificationSubmission()); - return comparator.compare(e1CertificationSubmission, e2CertificationSubmission); - } - return -1; + String e1CertificationSubmission = ObjectUtils.isNotEmpty(e1.getCertificationSubmission()) ? DateUtils.formatDate(e1.getCertificationSubmission()) : ""; + String e2CertificationSubmission = ObjectUtils.isNotEmpty(e2.getCertificationSubmission()) ? DateUtils.formatDate(e2.getCertificationSubmission()) : ""; + return comparator.compare(e1CertificationSubmission, e2CertificationSubmission); }); } else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) { Collections.sort(otaManageApplyEOList, (e1, e2) -> { - if (e1.getCertificationSubmission() != null && e2.getCertificationSubmission() != null) { - String e1CertificationSubmission = DateUtils.formatDate(e1.getCertificationSubmission()); - String e2CertificationSubmission = DateUtils.formatDate(e2.getCertificationSubmission()); - return comparator.compare(e2CertificationSubmission, e1CertificationSubmission); - } - return -1; + String e1CertificationSubmission = ObjectUtils.isNotEmpty(e1.getCertificationSubmission()) ? DateUtils.formatDate(e1.getCertificationSubmission()) : ""; + String e2CertificationSubmission = ObjectUtils.isNotEmpty(e2.getCertificationSubmission()) ? DateUtils.formatDate(e2.getCertificationSubmission()) : ""; + return comparator.compare(e2CertificationSubmission, e1CertificationSubmission); }); } } @@ -501,21 +489,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl { - if (e1.getAttestationEndTime() != null && e2.getAttestationEndTime() != null) { - String e1AttestationEndTime = DateUtils.formatDate(e1.getAttestationEndTime()); - String e2AttestationEndTime = DateUtils.formatDate(e2.getAttestationEndTime()); - return comparator.compare(e1AttestationEndTime, e2AttestationEndTime); - } - return -1; + String e1AttestationEndTime = ObjectUtils.isNotEmpty(e1.getAttestationEndTime()) ? DateUtils.formatDate(e1.getAttestationEndTime()) : ""; + String e2AttestationEndTime = ObjectUtils.isNotEmpty(e2.getAttestationEndTime()) ? DateUtils.formatDate(e2.getAttestationEndTime()) : ""; + return comparator.compare(e1AttestationEndTime, e2AttestationEndTime); }); } else if (OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())) { Collections.sort(otaManageApplyEOList, (e1, e2) -> { - if (e1.getAttestationEndTime() != null && e2.getAttestationEndTime() != null) { - String e1AttestationEndTime = DateUtils.formatDate(e1.getAttestationEndTime()); - String e2AttestationEndTime = DateUtils.formatDate(e2.getAttestationEndTime()); - return comparator.compare(e2AttestationEndTime, e1AttestationEndTime); - } - return -1; + String e1AttestationEndTime = ObjectUtils.isNotEmpty(e1.getAttestationEndTime()) ? DateUtils.formatDate(e1.getAttestationEndTime()) : ""; + String e2AttestationEndTime = ObjectUtils.isNotEmpty(e2.getAttestationEndTime()) ? DateUtils.formatDate(e2.getAttestationEndTime()) : ""; + return comparator.compare(e2AttestationEndTime, e1AttestationEndTime); }); } }