From 4dab6782c8bdf007c9ce1e4fa6360bcfca8316dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 8 Sep 2023 18:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9VDR=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/service/impl/OtaManageApplyEOServiceImpl.java | 11 ++++++++++-
 .../otaAuthentication/components/detil.vue            |  2 +-
 2 files changed, 11 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 fe3aef37b..3d5ba5b49 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
@@ -1114,6 +1114,10 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 result.addAll(collect);
             }
             List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+            //项目版本id
+            List<String> projectIdList = result.stream()
+                    .map(VersionVO::getProjectId).distinct().collect(Collectors.toList());
+            List<ProjectTaskPlanning> projectTaskPlanningList = projectTaskPlanningService.queryList(StringUtils.join(projectIdList, ","));
             for (VersionVO versionVO : result) {
                 List<DictModel> dictModelList = new ArrayList<>();
                 for (String s : versionVO.getMarket().split(",")) {
@@ -1132,7 +1136,12 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                     }
                 }
                 versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getYearName() + "-" + targetMarket + "-" + versionVO.getVersionNumber());
-                versionVO.setAttestationEndTime(new Date());
+                List<ProjectTaskPlanning> taskPlanningList = projectTaskPlanningList.stream()
+                            .filter(e -> versionVO.getProjectId().equals(e.getProjectId())).collect(Collectors.toList());
+                    if (!taskPlanningList.isEmpty()) {
+                        Date attestationEndTime = taskPlanningList.get(0).getAttestationEndTime();//认证批准
+                        versionVO.setAttestationEndTime(attestationEndTime);
+                    }
             }
 
             //ComplianceFlowStatusEnum
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index 958ff1208..13e2f30af 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -262,7 +262,7 @@
                              :label='item.versionName'
                              :key="key"
                              :value="item.projectId">
-                  <span style="display: inline-block;width: 100%" :title="item.versionName + '\n' + $t('certificationEnd') + ' : ' + item.attestationEndTime ">
+                  <span style="display: inline-block;width: 100%" :title="item.versionName + (item.attestationEndTime?'\n' + $t('certificationEnd') + ' : ' + item.attestationEndTime:'') ">
                     {{ item.versionName }}
                   </span>
             </a-select-option>