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 57b9c8dfc..4cb8b4512 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 @@ -167,8 +167,8 @@ public class OtaManageApplyEOController extends JeroController getProjectVersionList(String carMarket) { - List result = otaManageApplyEOService.getProjectVersionList(carMarket); + public Result getProjectVersionList(String carMarket,String cut) { + List result = otaManageApplyEOService.getProjectVersionList(carMarket,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 75b3f0b57..77eaaa1c4 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 @@ -102,7 +102,7 @@ public interface IOtaManageApplyEOService extends IService { * @param carMarket * @return */ - List getProjectVersionList(String carMarket); + List getProjectVersionList(String carMarket,String cut); /** * 全车型和分车型详情 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 19b7bd515..41939ca19 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 @@ -31,6 +31,7 @@ import com.jero.modules.ota.vo.VersionVO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectTaskPlanning; import com.jero.modules.project.enums.CertificationProgressEnum; +import com.jero.modules.project.enums.ComplianceFlowStatusEnum; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.impl.ProjectTaskPlanningServiceImpl; import com.jero.modules.system.entity.SysDictItem; @@ -672,7 +673,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl vprojectVersionList = getProjectVersionList(otaManageApplyEO.getAppliedVehicleProject()); + List vprojectVersionList = getProjectVersionList(otaManageApplyEO.getAppliedVehicleProject(),null); //项目版本id List projectVersionList = list.stream() .map(OtaManageApplyEO::getProjectVersion).distinct().collect(Collectors.toList()); @@ -850,7 +851,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getProjectVersionList(String carMarket) { + public List getProjectVersionList(String carMarket,String cut) { List result = new LinkedList<>(); if (StringUtils.isNotBlank(carMarket)) { @@ -889,6 +890,16 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl