From 1af08d725e3c4a5ba72214af0f531bea83ff3b5e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 24 Aug 2023 19:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89-=E6=B7=BB=E5=8A=A0=E4=B8=8D=E6=B6=89=E5=8F=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OtaManageApplyEOController.java    |  4 ++--
 .../ota/service/IOtaManageApplyEOService.java     |  2 +-
 .../service/impl/OtaManageApplyEOServiceImpl.java | 15 +++++++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java
index 57b9c8dfc..4cb8b4512 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java
@@ -167,8 +167,8 @@ public class OtaManageApplyEOController extends JeroController<OtaManageApplyEO,
 	@AutoLog(value = "项目版本下拉数据")
 	@ApiOperation(value="项目版本下拉数据", notes="项目版本下拉数据")
 	@GetMapping(value = "/getProjectVersionList")
-	public Result<?> getProjectVersionList(String carMarket) {
-		List<VersionVO> result = otaManageApplyEOService.getProjectVersionList(carMarket);
+	public Result<?> getProjectVersionList(String carMarket,String cut) {
+		List<VersionVO> result = otaManageApplyEOService.getProjectVersionList(carMarket,cut);
 		return Result.OK(result);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
index 75b3f0b57..77eaaa1c4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
@@ -102,7 +102,7 @@ public interface IOtaManageApplyEOService extends IService<OtaManageApplyEO> {
 	 * @param carMarket
 	 * @return
 	 */
-	List<VersionVO> getProjectVersionList(String carMarket);
+	List<VersionVO> getProjectVersionList(String carMarket,String cut);
 
 	/**
 	 * 全车型和分车型详情
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 19b7bd515..41939ca19 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
@@ -31,6 +31,7 @@ import com.jero.modules.ota.vo.VersionVO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectTaskPlanning;
 import com.jero.modules.project.enums.CertificationProgressEnum;
+import com.jero.modules.project.enums.ComplianceFlowStatusEnum;
 import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.impl.ProjectTaskPlanningServiceImpl;
 import com.jero.modules.system.entity.SysDictItem;
@@ -672,7 +673,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             }
         }
         if (!list.isEmpty()) {
-            List<VersionVO> vprojectVersionList = getProjectVersionList(otaManageApplyEO.getAppliedVehicleProject());
+            List<VersionVO> vprojectVersionList = getProjectVersionList(otaManageApplyEO.getAppliedVehicleProject(),null);
             //项目版本id
             List<String> projectVersionList = list.stream()
                     .map(OtaManageApplyEO::getProjectVersion).distinct().collect(Collectors.toList());
@@ -850,7 +851,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     }
 
     @Override
-    public List<VersionVO> getProjectVersionList(String carMarket) {
+    public List<VersionVO> getProjectVersionList(String carMarket,String cut) {
 
         List<VersionVO> result = new LinkedList<>();
         if (StringUtils.isNotBlank(carMarket)) {
@@ -889,6 +890,16 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             for (VersionVO versionVO : result) {
                 versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getYearName() + "-" + versionVO.getMarket() + "-" + versionVO.getVersionNumber());
             }
+
+            //ComplianceFlowStatusEnum
+            VersionVO versionVO = new VersionVO();
+            versionVO.setProjectId("busheji");
+            if(CutEnum.CN.getValue().equals(cut)){
+                versionVO.setVersionName("不涉及");
+            }else{
+                versionVO.setVersionName(ComplianceFlowStatusEnum.UNINVOLVED.getEnName());
+            }
+            result.add(versionVO);
         }
         return result;
     }