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:36:54 +08:00
parent 645c689938
commit 174100a30c
3 changed files with 9 additions and 5 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/controller/OtaManageApplyEOController.java
+2 -2
View File
@@ -184,8 +184,8 @@ public class OtaManageApplyEOController extends JeroController<OtaManageApplyEO,
@AutoLog(value = "全车型和分车型详情") @AutoLog(value = "全车型和分车型详情")
@ApiOperation(value="分车型详情", notes="分车型详情") @ApiOperation(value="分车型详情", notes="分车型详情")
@GetMapping(value = "/getVersionInfo") @GetMapping(value = "/getVersionInfo")
public Result<?> getVersionInfo(String vdr,String car) { public Result<?> getVersionInfo(String vdr,String car,String cut) {
List<VersionVO> result = otaManageApplyEOService.getVersionInfo(vdr,car); List<VersionVO> result = otaManageApplyEOService.getVersionInfo(vdr,car,cut);
return Result.OK(result); return Result.OK(result);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
+1 -1
View File
@@ -109,7 +109,7 @@ public interface IOtaManageApplyEOService extends IService<OtaManageApplyEO> {
* @param vdr * @param vdr
* @return * @return
*/ */
List<VersionVO> getVersionInfo(String vdr,String car); List<VersionVO> getVersionInfo(String vdr,String car,String cut);
void issueNotice(String id); void issueNotice(String id);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+6 -2
View File
@@ -944,7 +944,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
* @return * @return
*/ */
@Override @Override
public List<VersionVO> getVersionInfo(String vdr, String car) { public List<VersionVO> getVersionInfo(String vdr, String car,String cut) {
//认证进度数据字典 certification_progress //认证进度数据字典 certification_progress
List<SysDictItem> regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("certification_progress"); List<SysDictItem> regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("certification_progress");
@@ -988,7 +988,11 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
if (StringUtils.isNotBlank(versionVO.getAttestationSchedule())) { if (StringUtils.isNotBlank(versionVO.getAttestationSchedule())) {
List<SysDictItem> collect = regionDictList.stream() List<SysDictItem> collect = regionDictList.stream()
.filter(e -> e.getItemValue().equals(versionVO.getAttestationSchedule())).collect(Collectors.toList()); .filter(e -> e.getItemValue().equals(versionVO.getAttestationSchedule())).collect(Collectors.toList());
versionVO.setAttestationScheduleText(collect.get(0).getItemText()); if(CutEnum.CN.getValue().equals(cut)){
versionVO.setAttestationSchedule(collect.get(0).getItemText());
}else{
versionVO.setAttestationSchedule(collect.get(0).getEnName());
}
} }
} }
} }