From d451cfdfe06197ee2b8aa378570363962115cf12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sun, 20 Aug 2023 17:03:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OtaManageApplyEOController.java           | 16 +++++
 .../ota/mapper/OtaManageApplyEOMapper.java    |  3 +
 .../ota/mapper/xml/OtaManageApplyEOMapper.xml | 35 +++--------
 .../ota/service/IOtaManageApplyEOService.java |  4 ++
 .../impl/OtaManageApplyEOServiceImpl.java     | 62 ++++++++++++++++++-
 5 files changed, 90 insertions(+), 30 deletions(-)

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 6165259f6..6dacdb7dd 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
@@ -263,5 +263,21 @@ public class OtaManageApplyEOController extends JeroController<OtaManageApplyEO,
 		return Result.OK("操作成功！", res);
 	}
 
+	@AutoLog(value = "查询项目涉及的VDR版本")
+	@ApiOperation(value = "查询项目涉及的VDR版本", notes = "查询项目涉及的VDR版本")
+	@GetMapping(value = "/getVdrListByProject")
+	public Result<?> getVdrListByProject(String projectId, String cut) {
+		List<OtaManageApplyEO> resList = otaManageApplyEOService.getVdrListByProject(projectId, cut);
+		return Result.OK("操作成功！", resList);
+	}
+
+	@AutoLog(value = "通过软件版本和项目ID查询状态")
+	@ApiOperation(value = "通过软件版本和项目ID查询状态", notes = "通过软件版本和项目ID查询状态")
+	@GetMapping(value = "/getStatisticalStatus")
+	public Result<?> getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut) {
+		List<OtaManageApplyEO> resList = otaManageApplyEOService.getStatisticalStatus(projectId, plannedBpLaunchBatch, cut);
+		return Result.OK("操作成功！", resList);
+	}
+
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java
index 0fa2821d2..82086c564 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java
@@ -29,6 +29,9 @@ public interface OtaManageApplyEOMapper extends BaseMapper<OtaManageApplyEO> {
      */
     List<OtaManageApplyEO> getOtaCarPage(@Param("otaManageApplyEO") OtaManageApplyEO otaManageApplyEO);
 
+    List<OtaManageApplyEO> getReceiveByVdr(@Param("vdrList") List<String> vdrList);
+
+
     List<VersionVO> getByAppliedVehicleProject(@Param("appliedVehicleProject") String appliedVehicleProject);
 
     List<OtaManageApplyEO> getOtaCarList();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
index b24f8a408..afccc9060 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
@@ -43,34 +43,13 @@
         </where>
         order by create_time desc
     </select>
-<!--    <select id="getOtaPage" resultType="com.jero.modules.ota.entity.OtaManageApplyEO">-->
-<!--        select * from ota_manage_receive-->
-<!--        <where>-->
-<!--            <if test="otaManageApplyEO.plannedBpLaunchBatch != null and otaManageApplyEO.plannedBpLaunchBatch != ''">-->
-<!--                planned_bp_launch_batch_ =#{otaManageApplyEO.plannedBpLaunchBatch}-->
-<!--            </if>-->
-
-<!--            <if test="otaManageApplyEO.appliedVehicleProject != null and otaManageApplyEO.appliedVehicleProject != ''">-->
-<!--                and applied_vehicle_project LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.appliedVehicleProject}),'%')-->
-<!--            </if>-->
-
-<!--            <if test="otaManageApplyEO.market != null and otaManageApplyEO.market != ''">-->
-<!--                and applied_vehicle_project LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.market}),'%')-->
-<!--            </if>-->
-
-<!--            <if test="otaManageApplyEO.issueKey != null and otaManageApplyEO.issueKey != ''">-->
-<!--                and id LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.issueKey}),'%')-->
-<!--            </if>-->
-<!--            <if test="otaManageApplyEO.summary != null and otaManageApplyEO.summary != ''">-->
-<!--                and summary LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.summary}),'%')-->
-<!--            </if>-->
-<!--            <if test="otaManageApplyEO.impactHomo != null and otaManageApplyEO.impactHomo != ''">-->
-<!--                and (impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%')-->
-<!--                    or impact_eu_homo impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%'))-->
-<!--            </if>-->
-<!--        </where>-->
-<!--        order by create_time desc-->
-<!--    </select>-->
+    <select id="getReceiveByVdr" resultType="com.jero.modules.ota.entity.OtaManageApplyEO">
+        select * from ota_manage_receive
+        where id in
+        <foreach collection="vdrList" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
     <select id="getOtaCarPage" resultType="com.jero.modules.ota.entity.OtaManageApplyEO">
         select omr.id as vdr,omr.planned_bp_launch_batch_,omr.update_date,
         omr.summary,omr.status,
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 7322edd59..b36725949 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
@@ -119,4 +119,8 @@ public interface IOtaManageApplyEOService extends IService<OtaManageApplyEO> {
 	List<String> confirm(String ids, String cut);
 
 	List<String> reject(String ids, String rejectReason,String cut);
+
+    List<OtaManageApplyEO> getVdrListByProject(String projectId, String cut);
+
+	List<OtaManageApplyEO> getStatisticalStatus(String projectId, String plannedBpLaunchBatch, 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 8905ec4f3..765c8b5b2 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
@@ -67,6 +67,8 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 	private IOtaManageHistoryService otaManageHistoryService;
 
 
+	private static SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+	private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
 
 
 
@@ -155,8 +157,6 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 		List<OtaManageApplyEO> otaManageApplyEOList = otaManageApplyEOMapper.getOtaList(otaManageApplyEO);
 		if(!otaManageApplyEOList.isEmpty()){
 			List<String> otaNameList = OtaCarEnum.getOtaNameList();
-			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
 			List<String> plannedBpLaunchBatchList = otaManageApplyEOList.stream()
 					.filter(e -> StringUtils.isNotBlank(e.getPlannedBpLaunchBatch()))
 					.map(OtaManageApplyEO::getPlannedBpLaunchBatch).distinct().collect(Collectors.toList());
@@ -656,6 +656,64 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 		return msgList;
 	}
 
+	@Override
+	public List<OtaManageApplyEO> getVdrListByProject(String projectId, String cut) {
+		List<OtaManageApplyEO> res = new ArrayList<>();
+		QueryWrapper<OtaManageApplyEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().eq(OtaManageApplyEO::getProjectVersion, projectId);
+		List<OtaManageApplyEO> otaManageApplyEOS = this.list(queryWrapper);
+		List<String> vdrList = otaManageApplyEOS.stream()
+				.filter(e -> StringUtils.isNotBlank(e.getVdr()))
+				.map(OtaManageApplyEO::getVdr).distinct().collect(Collectors.toList());
+		if (CollectionUtils.isNotEmpty(vdrList)) {
+			res = otaManageApplyEOMapper.getReceiveByVdr(vdrList);
+			List<String> plannedBpLaunchBatchList = res.stream()
+					.filter(e -> StringUtils.isNotBlank(e.getPlannedBpLaunchBatch()))
+					.map(OtaManageApplyEO::getPlannedBpLaunchBatch).distinct().collect(Collectors.toList());
+			List<OtaManageReceiveNsdpEO> manageReceiveNsdpEOList = otaManageApplyEOMapper.getReleaseDate(plannedBpLaunchBatchList);
+			for (OtaManageApplyEO manageApplyEO : res) {
+				manageApplyEO.setVdr(manageApplyEO.getId());
+				List<OtaManageReceiveNsdpEO> collect = manageReceiveNsdpEOList.stream()
+						.filter(e -> StringUtils.isNotBlank(e.getReleaseName())
+								&& e.getReleaseName().equals(manageApplyEO.getPlannedBpLaunchBatch())).collect(Collectors.toList());
+				if (!collect.isEmpty()) {
+					List<String> releaseDateList = collect.stream().map(OtaManageReceiveNsdpEO::getReleaseDate).distinct().collect(Collectors.toList());
+					List<Integer> list = new ArrayList<>();
+					for (String s : releaseDateList) {
+						list.add(Integer.parseInt(s.replaceAll("-", "")));
+					}
+					Integer max = Collections.max(list);
+					try {
+						//发布时间
+						manageApplyEO.setReleaseName(sdf.format(dateFormat.parse(max.toString())));
+						manageApplyEO.setReleaseNameDate(dateFormat.parse(max.toString()));
+					} catch (ParseException e) {
+						log.error(e.getMessage(), e);
+					}
+				}
+			}
+		}
+
+		return res;
+	}
+
+	@Override
+	public List<OtaManageApplyEO> getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut) {
+		List<String> plannedBpLaunchBatchList = new ArrayList<>();
+		plannedBpLaunchBatchList.add(plannedBpLaunchBatch);
+//		List<OtaManageApplyEO> receiveList = otaManageApplyEOMapper.getReceiveByplannedBpLaunchBatch(plannedBpLaunchBatchList);
+//		List<String> vdrList = receiveList.stream()
+//				.filter(e -> StringUtils.isNotBlank(e.getId()))
+//				.map(OtaManageApplyEO::getId).distinct().collect(Collectors.toList());
+//		QueryWrapper<OtaManageApplyEO> queryWrapper = new QueryWrapper<>();
+//		queryWrapper.lambda().eq(OtaManageApplyEO::getProjectVersion, projectId);
+//		queryWrapper.lambda().in(OtaManageApplyEO::getVdr, vdrList);
+//		List<OtaManageApplyEO> otaManageApplyEOS = this.list(queryWrapper);
+
+
+		return null;
+	}
+
 	private List<OtaManageApplyEO> getListByIds(List<String> idList) {
 		QueryWrapper<OtaManageApplyEO> queryWrapper = new QueryWrapper<>();
 		queryWrapper.lambda().in(OtaManageApplyEO::getId, idList);