From dbaa47796c0017e6371ee15503f62234eb14cd0d Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Wed, 13 Apr 2022 15:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=96=87=E6=A1=A3=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/entity/ProjectLibraryBase.java    |  4 +--
 .../mapper/xml/ProjectLibraryBaseMapper.xml   | 34 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index 910e1d461..725bacf41 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -47,8 +47,8 @@ public class ProjectLibraryBase implements Serializable {
     /**认证工程师*/
     private java.lang.String certificationEngineer;
 
-    /**机械平台*/
-    private java.lang.String mechanicalPlatform;
+    /**车型平台*/
+    private java.lang.String vehiclePlatform;
 
     /**数字平台*/
     private java.lang.String digitalPlatform;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index dd51c9b8a..59e2029a5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -3,20 +3,22 @@
 <mapper namespace="com.jero.modules.project.mapper.ProjectLibraryBaseMapper">
     <resultMap id="ProjectLibraryBaseResultMap" type="com.jero.modules.project.entity.ProjectLibraryBase">
         <id column="id" property="id" />
+
+        <result column="project_name" property="projectName" />
+        <result column="target_market" property="targetMarket" />
+        <result column="project_status" property="projectStatus" />
+        <result column="studio_engineer" property="studioEngineer" />
+        <result column="certification_engineer" property="certificationEngineer" />
+        <result column="vehicle_platform" property="vehiclePlatform" />
+        <result column="digital_platform" property="digitalPlatform" />
+        <result column="ipd_info" property="ipdInfo" />
+        <result column="vehicle_development_plan" property="vehicleDevelopmentPlan" />
+        <result column="attestation_plan" property="attestationPlan" />
         <result column="create_user_id" property="createUserId" />
         <result column="create_time" property="createTime" />
         <result column="update_user_id" property="updateUserId" />
         <result column="update_time" property="updateTime" />
-        <result column="project_name" property="projectName" />
-        <result column="target_market" property="targetMarket" />
-        <result column="project_status" property="projectStatus" />
-        <result column="platform" property="platform" />
-        <result column="model_platform" property="modelPlatform" />
-        <result column="studio_engineer" property="studioEngineer" />
-        <result column="certification_engineer" property="certificationEngineer" />
-        <result column="ipd_info" property="ipdInfo" />
-        <result column="gate" property="gate" />
-        <result column="attestation_plan_time" property="attestationPlanTime" />
+
     </resultMap>
     <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
         select
@@ -28,11 +30,11 @@
             studiouser.username,
             plb.certification_engineer,
             certifyuser.username,
-            plb.ipd_info,
+            plb.vehicle_platform,
             plb.digital_platform,
-            plb.attestation_plan,
+            plb.ipd_info,
             plb.vehicle_development_plan,
-            plb.mechanical_platform,
+            plb.attestation_plan,
             plb.create_user_id,
             plb.create_time,
             plb.update_user_id,
@@ -87,9 +89,9 @@
             </choose>
         </if>
 
-        <!--搜索条件:机械平台-->
-        <if test="params.mechanicalPlatform != null and params.mechanicalPlatform != '' ">
-            and plb.mechanicalPlatform like concat('%',#{params.mechanicalPlatform},'%')
+        <!--搜索条件:车型平台-->
+        <if test="params.vehiclePlatform != null and params.vehiclePlatform != '' ">
+            and plb.vehicle_platform like concat('%',#{params.vehiclePlatform},'%')
         </if>
 
         <!--搜索条件:数字平台-->