From f4d5e178d502538850f94ee8c926c7d2e5b54938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 25 Aug 2023 01:31:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OtaManageApplyEOServiceImpl.java     | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

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 0a256da95..a8c4a6e4a 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
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.DateUtils;
 import com.jero.common.util.oConvertUtils;
@@ -37,8 +38,10 @@ import com.jero.modules.project.service.impl.ProjectTaskPlanningServiceImpl;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.entity.SysUserRole;
+import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.enums.RoleEnum;
 import com.jero.modules.system.mapper.SysUserRoleMapper;
+import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysBaseApiImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
@@ -103,6 +106,8 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     @Autowired
     private IOtaManagePermissionService otaManagePermissionService;
 
+    @Autowired
+    private ISysDictService sysDictService;
 
     @Value(value = "${jero.path.upload}")
     private String upLoadPath;
@@ -887,8 +892,25 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 });
                 result.addAll(collect);
             }
+            List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
             for (VersionVO versionVO : result) {
-                versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getYearName() + "-" + versionVO.getMarket() + "-" + versionVO.getVersionNumber());
+                List<DictModel> dictModelList = new ArrayList<>();
+                for (String s : versionVO.getMarket().split(",")) {
+                    List<DictModel> dictModelListTemp = targetMarketList.stream()
+                            .filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+                    dictModelList.addAll(dictModelListTemp);
+                }
+                String targetMarket = "";
+                if(dictModelList.size() != 0){
+                    StringBuilder sb = new StringBuilder();
+                    for (DictModel dictModel : dictModelList) {
+                            sb.append(dictModel.getTextEn()+",");
+                    }
+                    if(StringUtils.isNotBlank(sb)){
+                        targetMarket = sb.substring(0,sb.length()-1);
+                    }
+                }
+                versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getYearName() + "-" + targetMarket + "-" + versionVO.getVersionNumber());
             }
 
             //ComplianceFlowStatusEnum