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

表头排序-项目版本

Browse Source
This commit is contained in:
zhn
2023-08-21 14:23:47 +08:00
parent 8af763b9c1
commit 455e447f3e
1 changed files with 22 additions and 0 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
+22
View File
@@ -421,6 +421,22 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
});
}
}
//项目版本
if("projectVersionName".equals(otaManageApplyEO.getOrderByField())){
if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){
Collections.sort(otaManageApplyEOList,(e1, e2)->{
String e1ProjectVersionText = StringUtils.isNotBlank(e1.getProjectVersionText()) ? e1.getProjectVersionText() : "";
String e2ProjectVersionText = StringUtils.isNotBlank(e2.getProjectVersionText()) ? e2.getProjectVersionText() : "";
return comparator.compare(e1ProjectVersionText,e2ProjectVersionText);
});
}else if(OrderEnum.REVERSE.getValue().equals(otaManageApplyEO.getOrderBy())){
Collections.sort(otaManageApplyEOList,(e1,e2)->{
String e1ProjectVersionText = StringUtils.isNotBlank(e1.getProjectVersionText()) ? e1.getProjectVersionText() : "";
String e2ProjectVersionText = StringUtils.isNotBlank(e2.getProjectVersionText()) ? e2.getProjectVersionText() : "";
return comparator.compare(e2ProjectVersionText,e1ProjectVersionText);
});
}
}
//studio
if("studioText".equals(otaManageApplyEO.getOrderByField())){
if(OrderEnum.POSITIVE.getValue().equals(otaManageApplyEO.getOrderBy())){
@@ -599,6 +615,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
}
}
if(!list.isEmpty()){
List<VersionVO> vprojectVersionList = getProjectVersionList(otaManageApplyEO.getAppliedVehicleProject());
//项目版本id
List<String> projectVersionList = list.stream()
.map(OtaManageApplyEO::getProjectVersion).distinct().collect(Collectors.toList());
@@ -641,6 +658,11 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
manageApplyEO.setStudioText(studioEngineerUserName);
}
}
//项目版本
List<VersionVO> collect = vprojectVersionList.stream().filter(e -> e.getProjectId().equals(manageApplyEO.getProjectVersion())).distinct().collect(Collectors.toList());
if(!collect.isEmpty()){
manageApplyEO.setProjectVersionText(collect.get(0).getCar()+"-"+collect.get(0).getYearName()+"-"+collect.get(0).getMarket());
}
}
manageApplyEO.setDisabled(isDisabled);
if(StringUtils.isBlank(manageApplyEO.getRemark())){