WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改VDR搜索条件

Browse Source
This commit is contained in:
高嵩
2023-09-08 18:18:21 +08:00
parent d647d5adc2
commit 4dab6782c8
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+10 -1
View File
@@ -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
jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+1 -1
View File
@@ -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>