From 51d29bc69a11a9486982f897d42894b02dbe6512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 22 Aug 2023 18:26:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/IOtaManageReceiveService.java | 2 ++ .../impl/OtaManageApplyEOServiceImpl.java | 18 ++++++++++++++++++ .../impl/OtaManageReceiveServiceImpl.java | 8 ++++++++ 3 files changed, 28 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java index 9fb151488..540fbbd68 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java @@ -61,4 +61,6 @@ public interface IOtaManageReceiveService extends IService { List queryList(); List getReceiveByVdr(List vdrList); + + List getReceiveByplanned(String plannedBpLaunchBatch); } 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 973dbb210..7f227999c 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 @@ -84,6 +84,8 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl omrList = otaManageReceiveService.getReceiveByplanned(id); + List appliedVehicleProjectList = omrList.stream() + .filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject())) + .map(OtaManageReceive::getAppliedVehicleProject).distinct().collect(Collectors.toList()); + Map appMap = new HashMap<>(); + for (String appStr : appliedVehicleProjectList) { + if(StringUtils.isNotEmpty(appStr)){ + String[] appStrs = appStr.split(" "); + } + } + //查询所有NT2平台的项目 + ProjectLibraryBase plb = new ProjectLibraryBase(); + plb.setDigitalPlatform("NT2"); + List plbList = projectLibraryBaseService.getList(plb); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java index 3460e8ef2..700cfc038 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.ota.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.modules.ota.entity.OtaManageReceive; import com.jero.modules.ota.mapper.OtaManageReceiveMapper; import com.jero.modules.ota.service.IOtaManageReceiveService; @@ -91,4 +92,11 @@ public class OtaManageReceiveServiceImpl extends ServiceImpl getReceiveByVdr(List vdrList) { return this.getBaseMapper().getReceiveByVdr(vdrList); } + + @Override + public List getReceiveByplanned(String plannedBpLaunchBatch) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(OtaManageReceive::getPlannedBpLaunchBatch, plannedBpLaunchBatch); + return this.list(queryWrapper); + } }