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

修改VDR问题

Browse Source
This commit is contained in:
高嵩
2023-09-22 09:51:05 +08:00
parent c43e3fd729
commit ad9bff2c03
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) {
//找到最快来临的发布时间
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) {
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-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">