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

Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

Browse Source
This commit is contained in:
zyx.net
2023-09-22 11:01:48 +08:00
parent a8e4c88614 ad9bff2c03
commit 761afe9bf4
2 changed files with 18 additions and 17 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
+17 -16
View File
@@ -216,7 +216,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
for (OtaManageReceiveNsdp omrn : valList) { for (OtaManageReceiveNsdp omrn : valList) {
//找到最快来临的发布时间 //找到最快来临的发布时间
try { try {
if(StringUtils.isNotEmpty(omrn.getReleaseDate())){ if(StringUtils.isNotBlank(omrn.getReleaseDate())){
Date syncDate = sdf.parse(omrn.getReleaseDate()); Date syncDate = sdf.parse(omrn.getReleaseDate());
if (null == releaseDate) { if (null == releaseDate) {
releaseDate = syncDate; releaseDate = syncDate;
@@ -1336,21 +1336,21 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
List<VersionVO> versionVOList = this.getBaseMapper().getVersionInfo(vdr); List<VersionVO> versionVOList = this.getBaseMapper().getVersionInfo(vdr);
if (!versionVOList.isEmpty()) { if (!versionVOList.isEmpty()) {
List<VersionVO> oneList = versionVOList.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); // 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()); // List<VersionVO> twoList = versionVOList.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList());
//
for (VersionVO versionVO : oneList) { // for (VersionVO versionVO : oneList) {
result.add(versionVO); // result.add(versionVO);
List<VersionVO> collect = twoList.stream().filter(e -> versionVO.getProjectId().equals(e.getParentId())).collect(Collectors.toList()); // List<VersionVO> collect = twoList.stream().filter(e -> versionVO.getProjectId().equals(e.getParentId())).collect(Collectors.toList());
Collections.sort(collect, new Comparator<VersionVO>() { // Collections.sort(collect, new Comparator<VersionVO>() {
@Override // @Override
public int compare(VersionVO o1, VersionVO o2) { // public int compare(VersionVO o1, VersionVO o2) {
return Integer.valueOf(o1.getVersionNumber()).compareTo(Integer.valueOf(o2.getVersionNumber())); // return Integer.valueOf(o1.getVersionNumber()).compareTo(Integer.valueOf(o2.getVersionNumber()));
} // }
}); // });
result.addAll(collect); // result.addAll(collect);
} // }
for (VersionVO versionVO : result) { for (VersionVO versionVO : versionVOList) {
String market = versionVO.getMarket(); String market = versionVO.getMarket();
List<String> list = new LinkedList<>(); List<String> list = new LinkedList<>();
for (String s : market.split(",")) { for (String s : market.split(",")) {
@@ -1377,6 +1377,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
versionVO.setAttestationSchedule(collect.get(0).getEnName()); versionVO.setAttestationSchedule(collect.get(0).getEnName());
} }
} }
result.add(versionVO);
} }
} }
for (String vehicleStr : vehicleSet) { for (String vehicleStr : vehicleSet) {
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="Virtual-detail-header" style="position: fixed;top: 0"> <div class="Virtual-detail-header" style="position: fixed;top: 0">
<div class="Virtual-detail-title"> <div class="Virtual-detail-title">
<span> <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> </span>
</div> </div>
<div class="Virtual-detail-title-right"> <div class="Virtual-detail-title-right">