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-27 23:15:09 +08:00
parent 677f94de39
commit b61e59a979
1 changed files with 25 additions and 23 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
+4 -2
View File
@@ -687,20 +687,21 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
Map<String, OtaManageApplyEO> omaMap = new HashMap<>(); Map<String, OtaManageApplyEO> omaMap = new HashMap<>();
String carMarket = otaManageApplyEO.getAppliedVehicleProject(); String carMarket = otaManageApplyEO.getAppliedVehicleProject();
if (StringUtils.isNotBlank(carMarket) && !"全部".equals(carMarket) && !"All".equals(carMarket) && !otaManageApplyEOList.isEmpty()) { if (StringUtils.isNotBlank(carMarket) && !"全部".equals(carMarket) && !"All".equals(carMarket) && !otaManageApplyEOList.isEmpty()) {
String[] conditionSplit = carMarket.split(" "); String[] conditionSplit = carMarket.split(" ");
for (OtaManageApplyEO manageApplyEO : otaManageApplyEOList) { for (OtaManageApplyEO manageApplyEO : otaManageApplyEOList) {
if (omaMap.containsKey(manageApplyEO.getVdr()) if (omaMap.containsKey(manageApplyEO.getVdr())
&& StringUtils.isNotEmpty(omaMap.get(manageApplyEO.getVdr()).getVehicleType()) && StringUtils.isNotEmpty(omaMap.get(manageApplyEO.getVdr()).getVehicleType())
&& omaMap.get(manageApplyEO.getVdr()).getVehicleType().equals(otaManageApplyEO.getAppliedVehicleProject())) { && omaMap.get(manageApplyEO.getVdr()).getVehicleType().equals(otaManageApplyEO.getAppliedVehicleProject())) {
continue; continue;
} else { } else {
if (!otaManageApplyEO.getAppliedVehicleProject().equals(manageApplyEO.getVehicleType())) {
manageApplyEO.setId(UUID.randomUUID().toString().replace("-", "")); manageApplyEO.setId(UUID.randomUUID().toString().replace("-", ""));
manageApplyEO.setProjectVersion(null); manageApplyEO.setProjectVersion(null);
manageApplyEO.setAttestationSchedule(null); manageApplyEO.setAttestationSchedule(null);
manageApplyEO.setMatchStatus(null); manageApplyEO.setMatchStatus(null);
manageApplyEO.setRemark("--"); manageApplyEO.setRemark("--");
manageApplyEO.setVehicleType("");
}
} }
String appliedVehicleProject = manageApplyEO.getAppliedVehicleProject(); String appliedVehicleProject = manageApplyEO.getAppliedVehicleProject();
if (StringUtils.isNotBlank(appliedVehicleProject)) { if (StringUtils.isNotBlank(appliedVehicleProject)) {
@@ -957,6 +958,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
} }
return result; return result;
} }
public List<String> getStudioCarList(String plannedBpLaunchBatch) { public List<String> getStudioCarList(String plannedBpLaunchBatch) {
Set<String> set = new HashSet<>(); Set<String> set = new HashSet<>();
List<ProjectNameInfoEO> nameInfoEOList = projectNameInfoEOService.list(); List<ProjectNameInfoEO> nameInfoEOList = projectNameInfoEOService.list();