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

OTA列表-市场

Browse Source
This commit is contained in:
zhn
2023-08-28 10:15:50 +08:00
parent 997f2bb742
commit 7c28a6f5c8
2 changed files with 18 additions and 14 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/enums/OtaCarEnum.java
+1 -1
View File
@@ -7,7 +7,7 @@ public enum OtaCarEnum {
ALL("All", "All"), ALL("All", "All"),
CN_ALL("CN All", "EU All"), CN_ALL("CN All", "CN All"),
EU_ALL("EU All", "EU All"); EU_ALL("EU All", "EU All");
String name; String name;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+6 -2
View File
@@ -247,8 +247,11 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
carList = carList.stream().distinct().collect(Collectors.toList()); carList = carList.stream().distinct().collect(Collectors.toList());
manageApplyEO.setAppliedVehicleProject(StringUtils.join(carList, ",")); manageApplyEO.setAppliedVehicleProject(StringUtils.join(carList, ","));
//市场 //市场
for (String appliedVehicleProject : carList) {
Set<String> marketSet = new HashSet<>(); Set<String> marketSet = new HashSet<>();
for (String appliedVehicleProject : carList) {
if(otaNameList.contains(appliedVehicleProject)){
marketSet.add(appliedVehicleProject);
}else{
for (String s : appliedVehicleProject.split(",")) { for (String s : appliedVehicleProject.split(",")) {
String[] split = s.split(" "); String[] split = s.split(" ");
if (split.length == 2) { if (split.length == 2) {
@@ -261,12 +264,13 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
} }
} }
} }
}
}
if (!marketSet.isEmpty()) { if (!marketSet.isEmpty()) {
manageApplyEO.setMarket(StringUtils.join(marketSet, ",")); manageApplyEO.setMarket(StringUtils.join(marketSet, ","));
} }
} }
} }
}
result.add(manageApplyEO); result.add(manageApplyEO);
} }
} }