From ad9bff2c03e706b365742088987b9fe0c1600c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 22 Sep 2023 09:51:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9VDR=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OtaManageApplyEOServiceImpl.java     | 33 ++++++++++---------
 .../ParameterItemCollectionList.vue           |  2 +-
 2 files changed, 18 insertions(+), 17 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 c79038397..ec01d0f02 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
@@ -216,7 +216,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 for (OtaManageReceiveNsdp omrn : valList) {
                     //找到最快来临的发布时间
                     try {
-                        if(StringUtils.isNotEmpty(omrn.getReleaseDate())){
+                        if(StringUtils.isNotBlank(omrn.getReleaseDate())){
                             Date syncDate = sdf.parse(omrn.getReleaseDate());
                             if (null == releaseDate) {
                                 releaseDate = syncDate;
@@ -1336,21 +1336,21 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 
             List<VersionVO> versionVOList = this.getBaseMapper().getVersionInfo(vdr);
             if (!versionVOList.isEmpty()) {
-                List<VersionVO> oneList = versionVOList.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
-                List<VersionVO> twoList = versionVOList.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList());
-
-                for (VersionVO versionVO : oneList) {
-                    result.add(versionVO);
-                    List<VersionVO> collect = twoList.stream().filter(e -> versionVO.getProjectId().equals(e.getParentId())).collect(Collectors.toList());
-                    Collections.sort(collect, new Comparator<VersionVO>() {
-                        @Override
-                        public int compare(VersionVO o1, VersionVO o2) {
-                            return Integer.valueOf(o1.getVersionNumber()).compareTo(Integer.valueOf(o2.getVersionNumber()));
-                        }
-                    });
-                    result.addAll(collect);
-                }
-                for (VersionVO versionVO : result) {
+//                List<VersionVO> oneList = versionVOList.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
+//                List<VersionVO> twoList = versionVOList.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList());
+//
+//                for (VersionVO versionVO : oneList) {
+//                    result.add(versionVO);
+//                    List<VersionVO> collect = twoList.stream().filter(e -> versionVO.getProjectId().equals(e.getParentId())).collect(Collectors.toList());
+//                    Collections.sort(collect, new Comparator<VersionVO>() {
+//                        @Override
+//                        public int compare(VersionVO o1, VersionVO o2) {
+//                            return Integer.valueOf(o1.getVersionNumber()).compareTo(Integer.valueOf(o2.getVersionNumber()));
+//                        }
+//                    });
+//                    result.addAll(collect);
+//                }
+                for (VersionVO versionVO : versionVOList) {
                     String market = versionVO.getMarket();
                     List<String> list = new LinkedList<>();
                     for (String s : market.split(",")) {
@@ -1377,6 +1377,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                             versionVO.setAttestationSchedule(collect.get(0).getEnName());
                         }
                     }
+                    result.add(versionVO);
                 }
             }
             for (String vehicleStr : vehicleSet) {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 12f1be61d..daeb1d5b5 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -3,7 +3,7 @@
     <div class="Virtual-detail-header" style="position: fixed;top: 0">
       <div class="Virtual-detail-title">
         <span>
-          {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName.slice(0,-3))}}-{{$t(this.$route.query.projectVersion)}}) — {{$t(this.$route.query.title)}}
+          {{$t('ParameteItemCollectionList')}}({{this.$route.query.type == '1' ? $t(this.$route.query.projectName) : $t(this.$route.query.projectName.slice(0,-3)) + '-' + $t(this.$route.query.projectVersion)}}) — {{$t(this.$route.query.title)}}
         </span>
       </div>
       <div class="Virtual-detail-title-right">