From 8a892d153799227e5fc27a02a8a3e499929c2ed1 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 18 Aug 2023 16:40:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=BD=A6=E5=9E=8B-?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/mapper/xml/OtaManageApplyEOMapper.xml    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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 172c2dfe5..8da024719 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
@@ -30,15 +30,15 @@
                 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 test="otaManageApplyEO.vdr != null and otaManageApplyEO.vdr != ''">
+                and id LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.vdr}),'%')
             </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}),'%'))
+                    and impact_eu_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%'))
             </if>
         </where>
         order by create_time desc
@@ -78,15 +78,15 @@
         left join ota_manage_apply oma on oma.issue_key = omr.id
         <where>
             1=1
-            <if test="otaManageApplyEO.issueKey != null and otaManageApplyEO.issueKey != ''">
-                and ts.issue_key LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.issueKey}),'%')
+            <if test="otaManageApplyEO.vdr != null and otaManageApplyEO.vdr != ''">
+                and omr.id LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.vdr}),'%')
             </if>
             <if test="otaManageApplyEO.summary != null and otaManageApplyEO.summary != ''">
-                and ts.summary LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.summary}),'%')
+                and omr.summary LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.summary}),'%')
             </if>
             <if test="otaManageApplyEO.impactHomo != null and otaManageApplyEO.impactHomo != ''">
-                and (ts.impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%')
-                    or impact_eu_homo ts.impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%'))
+                and (omr.impact_cn_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%')
+                    and omr.impact_eu_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%'))
             </if>
         </where>
         order by create_time desc

From 78698079cbc0ac5d5a0c656609189d849c0da94e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 18 Aug 2023 16:48:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml  | 6 +++++-
 .../ota/service/impl/OtaManageApplyEOServiceImpl.java       | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

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 8da024719..df1a21771 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
@@ -77,7 +77,11 @@
         from ota_manage_receive omr
         left join ota_manage_apply oma on oma.issue_key = omr.id
         <where>
-            1=1
+                1=1
+            <if test="otaManageApplyEO.plannedBpLaunchBatch != null and otaManageApplyEO.plannedBpLaunchBatch != ''">
+                and omr.planned_bp_launch_batch_ =#{otaManageApplyEO.plannedBpLaunchBatch}
+            </if>
+
             <if test="otaManageApplyEO.vdr != null and otaManageApplyEO.vdr != ''">
                 and omr.id LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.vdr}),'%')
             </if>
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 07b235ad3..4153b19de 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
@@ -215,6 +215,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 			String[] conditionSplit = carMarket.split(" ");
 
 			for (OtaManageApplyEO manageApplyEO : otaManageApplyEOList) {
+				manageApplyEO.setVdr(manageApplyEO.getId());
 				String appliedVehicleProject = manageApplyEO.getAppliedVehicleProject();
 				if(StringUtils.isNotBlank(appliedVehicleProject)){
 					String[] appliedVehicleProjectArr = appliedVehicleProject.split(",");