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 10d8c077e..0a256da95 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 @@ -1410,12 +1410,28 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl new TreeSet<>(Comparator.comparing(o -> o.getPlannedBpLaunchBatch()))), ArrayList::new)); - for (OtaManageApplyEO rec : receiveList) { - if (CutEnum.CN.getValue().equals(cut)) { - rec.setAppliedVehicleProject("全部"); + String name = ""; + String market = ""; + ProjectLibraryBase plb = projectLibraryBaseService.selectById(projectId); + if (ObjectUtils.isNotEmpty(plb)) { + if (StringUtils.isNotEmpty(plb.getProjectName()) && plb.getProjectName().equals("FORCE")) { + name = "Force"; } 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;