From 42ee237c55468f618d09be8aac02be9ff380c987 Mon Sep 17 00:00:00 2001
From: Liu Wu <2780205363@qq.com>
Date: Fri, 20 Sep 2024 20:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/muyu/domain/SysCarLog.java  |  1 +
 .../java/com/muyu/domain/req/SysCarReq.java   |  1 +
 .../muyu/service/impl/SysCarServiceImpl.java  |  1 +
 .../main/resources/mapper/SysCarMapper.xml    | 23 ++++++++++---------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCarLog.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCarLog.java
index 62d4dc2..a479e22 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCarLog.java
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCarLog.java
@@ -14,6 +14,7 @@ import java.util.Date;
 @TableName(value = "sys_car_log",autoResultMap = true)
 public class SysCarLog {
 
+
     private String id;
     private String carVin;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/req/SysCarReq.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/req/SysCarReq.java
index 46acd38..ee02031 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/req/SysCarReq.java
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/req/SysCarReq.java
@@ -15,4 +15,5 @@ public class SysCarReq {
     private String carMotorModel;
     private String carBatteryManufacturer;
     private String carBatteryModel;
+    private String state;
 }
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java
index 388674f..8232f05 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java
@@ -3,6 +3,7 @@ package com.muyu.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.domain.SysCar;
 import com.muyu.domain.req.SysCarReq;
+
 import com.muyu.domain.resp.SysCarVo;
 import com.muyu.mapper.SysCarMapper;
 import com.muyu.service.SysCarService;
diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml
index fdfd15b..342a4a1 100644
--- a/cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml
+++ b/cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml
@@ -3,6 +3,16 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.muyu.mapper.SysCarMapper">
+
+
+
+    <select id="selectSysCarVoById" resultType="com.muyu.domain.resp.SysCarVo">
+        SELECT * ,car_type.type_name,tb_fence.fence_name
+        FROM `sys_car`
+                 LEFT JOIN car_type ON sys_car.car_type_id=car_type.id
+                 LEFT JOIN tb_fence ON sys_car.fence_id=tb_fence.fence_id
+        where sys_car.id=#{id}
+    </select>
     <select id="selectSysCarVoList" resultType="com.muyu.domain.resp.SysCarVo">
         SELECT * ,car_type.type_name,tb_fence.fence_name
         FROM `sys_car`
@@ -13,10 +23,10 @@
                 sys_car.car_vin=#{carVin}
             </if>
             <if test="state!=null and state!=''">
-              and  sys_car.state=#{state}
+                and  sys_car.state=#{state}
             </if>
             <if test="carMotorManufacturer!=null and carMotorManufacturer!=''">
-             and  sys_car.car_motor_manufacturer=#{carMotorManufacturer}
+                and  sys_car.car_motor_manufacturer=#{carMotorManufacturer}
             </if>
             <if test="carBatteryManufacturer!=null and carBatteryManufacturer!=''">
                 and  sys_car.car_battery_manufacturer=#{carBatteryManufacturer}
@@ -29,13 +39,4 @@
             </if>
         </where>
     </select>
-
-
-    <select id="selectSysCarVoById" resultType="com.muyu.domain.resp.SysCarVo">
-        SELECT * ,car_type.type_name,tb_fence.fence_name
-        FROM `sys_car`
-                 LEFT JOIN car_type ON sys_car.car_type_id=car_type.id
-                 LEFT JOIN tb_fence ON sys_car.fence_id=tb_fence.fence_id
-        where sys_car.id=#{id}
-    </select>
 </mapper>