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

修改OTAbug

Browse Source
This commit is contained in:
高嵩
2023-08-25 01:15:12 +08:00
parent 90b432a2f8
commit a2d00295f5
1 changed files with 20 additions and 4 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
+20 -4
View File
@@ -1410,12 +1410,28 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
receiveList = receiveList.stream() receiveList = receiveList.stream()
.collect(Collectors.collectingAndThen(Collectors .collect(Collectors.collectingAndThen(Collectors
.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getPlannedBpLaunchBatch()))), ArrayList::new)); .toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getPlannedBpLaunchBatch()))), ArrayList::new));
for (OtaManageApplyEO rec : receiveList) { String name = "";
if (CutEnum.CN.getValue().equals(cut)) { String market = "";
rec.setAppliedVehicleProject("全部"); ProjectLibraryBase plb = projectLibraryBaseService.selectById(projectId);
if (ObjectUtils.isNotEmpty(plb)) {
if (StringUtils.isNotEmpty(plb.getProjectName()) && plb.getProjectName().equals("FORCE")) {
name = "Force";
} else { } else {
rec.setAppliedVehicleProject("All"); name = plb.getProjectName();
} }
if (StringUtils.isNotEmpty(plb.getTargetMarket())) {
String[] marketStrs = plb.getTargetMarket().split(",");
if (marketStrs[0].equals("china")) {
market = "CN";
} else if (marketStrs[0].equals("UK")) {
market = "RHD";
} else {
market = marketStrs[0];
}
}
}
for (OtaManageApplyEO rec : receiveList) {
rec.setAppliedVehicleProject(name + " " + market);
} }
} }
return receiveList; return receiveList;