diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java index 102c7dd12..ff5d721a0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java @@ -184,8 +184,8 @@ public class OtaManageApplyEOController extends JeroController getVersionInfo(String vdr,String car) { - List result = otaManageApplyEOService.getVersionInfo(vdr,car); + public Result getVersionInfo(String vdr,String car,String cut) { + List result = otaManageApplyEOService.getVersionInfo(vdr,car,cut); return Result.OK(result); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java index 3c8248d71..45220cbb6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java @@ -109,7 +109,7 @@ public interface IOtaManageApplyEOService extends IService { * @param vdr * @return */ - List getVersionInfo(String vdr,String car); + List getVersionInfo(String vdr,String car,String cut); void issueNotice(String id); 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 b0d7dd507..afaf8ba55 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 @@ -944,7 +944,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getVersionInfo(String vdr, String car) { + public List getVersionInfo(String vdr, String car,String cut) { //认证进度数据字典 certification_progress List regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("certification_progress"); @@ -988,7 +988,11 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl collect = regionDictList.stream() .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()); + } } } }