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

Merge remote-tracking branch 'origin/dev_20230808_OTA'

Browse Source
This commit is contained in:
高嵩
2023-08-27 22:50:51 +08:00
parent e2be7ca10e 997f2bb742
commit 677f94de39
2 changed files with 14 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/mapper/xml/OtaManageApplyEOMapper.xml
+3 -3
View File
@@ -122,9 +122,9 @@
plb.project_version versionNumber, plb.project_version versionNumber,
pni.project_name car, pni.project_name car,
pyni.year_name yearName from project_library_base plb pyni.year_name yearName from project_library_base plb
join project_name_info pni on pni.id = plb.project_name_id JOIN project_name_info pni ON pni.id = plb.project_name_id
join project_year_name_info pyni on pyni.project_name_id = pni.id JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
where plb.target_market LIKE CONCAT(CONCAT('%',#{market}),'%') where plb.target_market =#{market}
and pni.project_name =#{car} and pni.project_name =#{car}
GROUP BY plb.id GROUP BY plb.id
ORDER BY project_version asc ORDER BY project_version asc
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+11 -1
View File
@@ -1021,7 +1021,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
@Override @Override
public List<VersionVO> getProjectVersionList(String carMarket, String cut) { public List<VersionVO> getProjectVersionList(String carMarket, String cut) {
List<DictModel> dictModels = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
List<VersionVO> result = new LinkedList<>(); List<VersionVO> result = new LinkedList<>();
if (StringUtils.isNotBlank(carMarket)) { if (StringUtils.isNotBlank(carMarket)) {
List<VersionVO> versionVOList = new LinkedList<>(); List<VersionVO> versionVOList = new LinkedList<>();
@@ -1032,6 +1032,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
if (conditionSplit.length > 1) { if (conditionSplit.length > 1) {
market = conditionSplit[1]; market = conditionSplit[1];
} }
if (StringUtils.isNotBlank(market)) { if (StringUtils.isNotBlank(market)) {
if (market.equals("CN")) { if (market.equals("CN")) {
//项目库里市场存的是China 不是CN //项目库里市场存的是China 不是CN
@@ -1041,6 +1042,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
market = "UK"; market = "UK";
} }
} }
if("FORCE".equals(car)){
car = "Force";
}
String finalMarket = market;
List<DictModel> modelList = dictModels.stream().filter(e -> e.getTextEn().equals(finalMarket)).collect(Collectors.toList());
if(!modelList.isEmpty()){
market = modelList.get(0).getValue();
}
versionVOList = this.getBaseMapper().getProjectVersion(car, market); versionVOList = this.getBaseMapper().getProjectVersion(car, market);
List<VersionVO> oneList = versionVOList.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); List<VersionVO> oneList = versionVOList.stream().filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList());
List<VersionVO> twoList = versionVOList.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList()); List<VersionVO> twoList = versionVOList.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList());