From 645c6899388cddba2a271a5a518b7655f8279413 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 25 Aug 2023 14:23:05 +0800
Subject: [PATCH] =?UTF-8?q?VDR=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OtaManageApplyEOServiceImpl.java       | 17 +++++++++++++++--
 .../java/com/jero/modules/ota/vo/VersionVO.java |  8 ++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

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 fecedad6c..b0d7dd507 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
@@ -948,6 +948,8 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
         //认证进度数据字典 certification_progress
         List<SysDictItem> regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("certification_progress");
 
+        List<DictModel> regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+
         List<VersionVO> versionVOList = this.getBaseMapper().getVersionInfo(vdr);
         List<VersionVO> result = new LinkedList<>();
         if (!versionVOList.isEmpty()) {
@@ -966,10 +968,21 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 result.addAll(collect);
             }
             for (VersionVO versionVO : result) {
+                String market = versionVO.getMarket();
+                List<String> list = new LinkedList<>();
+                for (String s : market.split(",")) {
+                    List<DictModel> collect = regionList.stream().filter(e -> e.getValue().equals(s)).collect(Collectors.toList());
+                    if(!collect.isEmpty()){
+                        list.add(collect.get(0).getTextEn());
+                    }
+                }
+                if(!list.isEmpty()){
+                    market = StringUtils.join(list,",");
+                }
                 if (StringUtils.isBlank(versionVO.getProjectVersion())) {
-                    versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getMarket());
+                    versionVO.setVersionName(versionVO.getCar() + "-" + market);
                 } else {
-                    versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getYearName() + "-" + versionVO.getMarket() + "-" + versionVO.getVersionNumber());
+                    versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getYearName() + "-" + market + "-" + versionVO.getVersionNumber());
                 }
                 //认证进度
                 if (StringUtils.isNotBlank(versionVO.getAttestationSchedule())) {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java
index 9e385b27a..e8bf7f9bc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java
@@ -1,7 +1,9 @@
 package com.jero.modules.ota.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -19,12 +21,18 @@ public class VersionVO {
     @ApiModelProperty(value = "父id")
     private String parentId;
 
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "认证开始")
     private Date attestationStartTime;
 
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "认证申报")
     private Date certificationSubmission;
 
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "认证批准")
     private Date attestationEndTime;