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:
zhn
2023-08-25 14:23:05 +08:00
parent 3a5c4dbe43
commit 645c689938
2 changed files with 23 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
+15 -2
View File
@@ -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())) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/VersionVO.java
+8
View File
@@ -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;