From 174100a30c70d90895bfc4f3e5381943358c066a Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 25 Aug 2023 14:36:54 +0800
Subject: [PATCH] =?UTF-8?q?VDR=E8=AF=A6=E6=83=85-=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/controller/OtaManageApplyEOController.java        | 4 ++--
 .../modules/ota/service/IOtaManageApplyEOService.java     | 2 +-
 .../ota/service/impl/OtaManageApplyEOServiceImpl.java     | 8 ++++++--
 3 files changed, 9 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 102c7dd12..ff5d721a0 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
@@ -184,8 +184,8 @@ public class OtaManageApplyEOController extends JeroController<OtaManageApplyEO,
 	@AutoLog(value = "全车型和分车型详情")
 	@ApiOperation(value="分车型详情", notes="分车型详情")
 	@GetMapping(value = "/getVersionInfo")
-	public Result<?> getVersionInfo(String vdr,String car) {
-		List<VersionVO> result = otaManageApplyEOService.getVersionInfo(vdr,car);
+	public Result<?> getVersionInfo(String vdr,String car,String cut) {
+		List<VersionVO> result = otaManageApplyEOService.getVersionInfo(vdr,car,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 3c8248d71..45220cbb6 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
@@ -109,7 +109,7 @@ public interface IOtaManageApplyEOService extends IService<OtaManageApplyEO> {
 	 * @param vdr
 	 * @return
 	 */
-	List<VersionVO> getVersionInfo(String vdr,String car);
+	List<VersionVO> getVersionInfo(String vdr,String car,String cut);
 
 	void issueNotice(String id);
 
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 b0d7dd507..afaf8ba55 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
@@ -944,7 +944,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
      * @return
      */
     @Override
-    public List<VersionVO> getVersionInfo(String vdr, String car) {
+    public List<VersionVO> getVersionInfo(String vdr, String car,String cut) {
         //认证进度数据字典 certification_progress
         List<SysDictItem> regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("certification_progress");
 
@@ -988,7 +988,11 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 if (StringUtils.isNotBlank(versionVO.getAttestationSchedule())) {
                     List<SysDictItem> collect = regionDictList.stream()
                             .filter(e -> e.getItemValue().equals(versionVO.getAttestationSchedule())).collect(Collectors.toList());
-                    versionVO.setAttestationScheduleText(collect.get(0).getItemText());
+                    if(CutEnum.CN.getValue().equals(cut)){
+                        versionVO.setAttestationSchedule(collect.get(0).getItemText());
+                    }else{
+                        versionVO.setAttestationSchedule(collect.get(0).getEnName());
+                    }
                 }
             }
         }