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 targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + //项目版本id + List projectIdList = result.stream() + .map(VersionVO::getProjectId).distinct().collect(Collectors.toList()); + List projectTaskPlanningList = projectTaskPlanningService.queryList(StringUtils.join(projectIdList, ",")); for (VersionVO versionVO : result) { List dictModelList = new ArrayList<>(); for (String s : versionVO.getMarket().split(",")) { @@ -1132,7 +1136,12 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl 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"> - + {{ item.versionName }}