From a2d00295f5610fb54060b41ac4ae2df768735700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 25 Aug 2023 01:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OtaManageApplyEOServiceImpl.java     | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 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 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<OtaManageApplyEOMap
             receiveList = receiveList.stream()
                     .collect(Collectors.collectingAndThen(Collectors
                             .toCollection(() -> 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;