From 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 16:17:08 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java
index 5ed6b81..c06bc9a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java
@@ -5,10 +5,13 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
 import com.panzhihua.common.model.vos.community.ComMngCarVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationCarVO;
 import com.panzhihua.service_community.model.dos.ComMngCarDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * @description: 车辆管理
@@ -27,11 +30,11 @@
             " t2.area_name AS areaName, " +
             " t.user_id userId, " +
             " t.user_name AS userName, " +
+            " t.address, " +
             " t.mobile, " +
             " t.plate_num AS plateNum, " +
             " t.brand, " +
             " t.color, " +
-            " t.model, " +
             " t.create_at AS createAt, " +
             " t3.`name` AS createBy  " +
             "FROM " +
@@ -39,14 +42,27 @@
             " LEFT JOIN com_act t1 ON t.community_id = t1.community_id " +
             " LEFT JOIN com_mng_struct_area t2 ON t2.id = t.area_id " +
             " LEFT JOIN sys_user t3 ON t.create_by = t3.user_id " +
-            " WHERE t.source =2 " +
-            "<if test='pageComMngCarDTO.name != null and pageComMngCarDTO.name.trim() != &quot;&quot;'>" +
-            " and t.user_name LIKE concat( #{pageComMngCarDTO.name}, '%' )  " +
+            " WHERE 1=1" +
+            "<if test='pageComMngCarDTO.name != null and pageComMngCarDTO.name != &quot;&quot;'>" +
+            " and t.user_name LIKE concat( '%',#{pageComMngCarDTO.name}, '%' )  " +
+            " </if> " +
+            "<if test='pageComMngCarDTO.villageId != null'>" +
+            " and t.area_id = #{pageComMngCarDTO.villageId} " +
             " </if> " +
             "<if test='pageComMngCarDTO.communityId != null and pageComMngCarDTO.communityId != 0'>" +
             " and t.community_id = #{pageComMngCarDTO.communityId} " +
             " </if> " +
-            " order by t.create_at desc"+
+            "<if test='pageComMngCarDTO.areaName != null'>" +
+            " and t2.area_name LIKE concat( '%',#{pageComMngCarDTO.areaName}, '%' )  " +
+            " </if> " +
+            " order by t.create_at desc" +
             "</script>")
     IPage<ComMngCarVO> pageQueryComMngCar(Page page, @Param(value = "pageComMngCarDTO") PageComMngCarDTO pageComMngCarDTO);
+
+    @Select("select cmc.id,cmc.plate_num,cmc.color,cmc.brand from com_mng_car as cmc " +
+            " left join sys_user as su on su.user_id = cmc.user_id " +
+            " where su.id_card = #{idCard}")
+    List<ComMngPopulationCarVO> getPopulationCarListByIdCard(@Param(value = "idCard") String idCard);
+
+
 }

--
Gitblit v1.7.1