From b401518b836f9c32d66b62de652fb056e7ae09f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 24 Aug 2023 09:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/ota/mapper/OtaManageReceiveMapper.java   | 1 +
 .../modules/ota/mapper/xml/OtaManageApplyEOMapper.xml     | 8 ++++----
 .../modules/ota/mapper/xml/OtaManageReceiveMapper.xml     | 6 +++++-
 .../ota/service/impl/OtaManageReceiveServiceImpl.java     | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageReceiveMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageReceiveMapper.java
index 506255e45..68deba413 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageReceiveMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageReceiveMapper.java
@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface OtaManageReceiveMapper extends BaseMapper<OtaManageReceive> {
     List<OtaManageReceive> getReceiveByVdr(@Param("vdrList") List<String> vdrList);
 
+    List<OtaManageReceive> getReceiveList();
     List<OtaManageReceive> getReceiveSync();
 
 }
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 2a3ea34d4..7f9372191 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
@@ -21,7 +21,7 @@
         <where>
             ota_manage_apply.project_version =#{projectId}
             <if test="plannedBpLaunchBatch != null and plannedBpLaunchBatch != ''">
-                and ota_manage_receive.planned_bp_launch_batch_ =#{plannedBpLaunchBatch}
+                and ota_manage_receive.planned_bp_launch_batch =#{plannedBpLaunchBatch}
             </if>
         </where>
     </select>
@@ -30,7 +30,7 @@
         select * from ota_manage_receive
         <where>
             <if test="otaManageApplyEO.plannedBpLaunchBatch != null and otaManageApplyEO.plannedBpLaunchBatch != ''">
-                planned_bp_launch_batch_ =#{otaManageApplyEO.plannedBpLaunchBatch}
+                planned_bp_launch_batch =#{otaManageApplyEO.plannedBpLaunchBatch}
             </if>
 
             <if test="otaManageApplyEO.appliedVehicleProject != null and otaManageApplyEO.appliedVehicleProject != ''">
@@ -56,7 +56,7 @@
     </select>
 
     <select id="getOtaCarPage" resultType="com.jero.modules.ota.entity.OtaManageApplyEO">
-        select omr.id as vdr,omr.planned_bp_launch_batch_,omr.update_date,
+        select omr.id as vdr,omr.planned_bp_launch_batch,omr.update_date,
         omr.summary,omr.status,
         omr.homologation_impact,omr.homologation,
         omr.impact_cn_homo,omr.impact_eu_homo,
@@ -67,7 +67,7 @@
         <where>
                 1=1
             <if test="otaManageApplyEO.plannedBpLaunchBatch != null and otaManageApplyEO.plannedBpLaunchBatch != ''">
-                and omr.planned_bp_launch_batch_ =#{otaManageApplyEO.plannedBpLaunchBatch}
+                and omr.planned_bp_launch_batch =#{otaManageApplyEO.plannedBpLaunchBatch}
             </if>
 
             <if test="otaManageApplyEO.vdr != null and otaManageApplyEO.vdr != ''">
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageReceiveMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageReceiveMapper.xml
index b25eb5b52..eced34af0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageReceiveMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageReceiveMapper.xml
@@ -8,7 +8,7 @@
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="sys_org_code" property="sysOrgCode" />
-        <result column="planned_bp_launch_batch_" property="plannedBpLaunchBatch" />
+        <result column="planned_bp_launch_batch" property="plannedBpLaunchBatch" />
         <result column="update_date" property="updateDate" />
         <result column="summary" property="summary" />
         <result column="status" property="status" />
@@ -28,6 +28,10 @@
         </foreach>
     </select>
 
+    <select id="getReceiveList" resultType="com.jero.modules.ota.entity.OtaManageReceive">
+        select * from ota_manage_receive
+    </select>
+
     <select id="getReceiveSync" resultType="com.jero.modules.ota.entity.OtaManageReceive">
         select * from ota_manage_receive_sync
     </select>
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 9bf7730e6..8292a10d1 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
@@ -85,7 +85,7 @@ public class OtaManageReceiveServiceImpl extends ServiceImpl<OtaManageReceiveMap
 	 */
 	@Override
     public List<OtaManageReceive> queryList() {
-        return list();
+        return this.getBaseMapper().getReceiveList();
     }
 
 	@Override