From 94f9dfb5b7b6d1e5ab28f4e8f211a2ca50e4d60f Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 9 Jun 2023 16:37:44 +0800
Subject: [PATCH] update

---
 .../domain/MemberPlateNumberRelation.java     | 25 +++++++----
 .../jsowell/pile/vo/MemberPlateNumberVO.java  | 42 +++++++++++++++++++
 .../pile/MemberPlateNumberRelationMapper.xml  | 11 ++++-
 3 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberPlateNumberVO.java

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberPlateNumberRelation.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberPlateNumberRelation.java
index ab22f71d2..b0ba6494d 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberPlateNumberRelation.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberPlateNumberRelation.java
@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * 用户车牌对应关系对象 member_license_plate_number_relation
- * 
+ *
  * @author jsowell
  * @date 2023-03-06
  */
@@ -16,25 +16,34 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class MemberPlateNumberRelation
-{
+public class MemberPlateNumberRelation {
     private static final long serialVersionUID = 1L;
 
-    /** 主键 */
+    /**
+     * 主键
+     */
     private Integer id;
 
-    /** 会员id */
+    /**
+     * 会员id
+     */
     @Excel(name = "会员id")
     private String memberId;
 
-    /** 手机号码 */
+    /**
+     * 手机号码
+     */
     private String phoneNumber;
 
-    /** 车牌号 */
+    /**
+     * 车牌号
+     */
     @Excel(name = "车牌号")
     private String licensePlateNumber;
 
-    /** 创建时间 */
+    /**
+     * 创建时间
+     */
     private String createTime;
 
     /**
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberPlateNumberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberPlateNumberVO.java
new file mode 100644
index 000000000..7d4f086d6
--- /dev/null
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/MemberPlateNumberVO.java
@@ -0,0 +1,42 @@
+package com.jsowell.pile.vo;
+
+import com.jsowell.common.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class MemberPlateNumberVO {
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 会员id
+     */
+    private String memberId;
+
+    /**
+     * 手机号码
+     */
+    private String phoneNumber;
+
+    /**
+     * 车牌号
+     */
+    private String licensePlateNumber;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 删除标识
+     */
+    private String delFlag;
+
+    /**
+     * 车辆vin码
+     */
+    private String vinCode;
+}
diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml
index 03dc8e386..7d1e0169a 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml
@@ -24,8 +24,15 @@
 
     <select id="selectMemberPlateNumberRelationList" parameterType="com.jsowell.pile.domain.MemberPlateNumberRelation" resultMap="MemberLicensePlateNumberRelationResult">
         select
-            <include refid="Base_Column_List"/>
-        from member_plate_number_relation
+            t1.id,
+            t1.member_id as memberId,
+            t1.phone_number as phoneNumber,
+            t1.license_plate_number as licensePlateNumber,
+            t1.create_time as createTime,
+            t1.del_flag as delFlag,
+            t2.vin_code as vinCode
+        from member_plate_number_relation t1
+        join car_vin_info on t1.member_id = t2.member_id
         where del_flag = '0'
         <if test="memberId != null  and memberId != ''"> and member_id = #{memberId}</if>
         <if test="phoneNumber != null  and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>