From 455e447f3e8ed0ff296f361a74f355a1a05f6b4c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 21 Aug 2023 14:23:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F-=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OtaManageApplyEOServiceImpl.java     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

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 c088b58d1..a51b8e89b 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
@@ -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())){