From d2baab8c43dca88365dac6e98a95ceee644001e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 15 七月 2021 09:47:53 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 46 insertions(+), 2 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 ac58e74..383f612 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
@@ -3,12 +3,20 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
+import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
 import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
 import com.panzhihua.common.model.vos.community.ComMngCarVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationCarVO;
+import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
 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: 车辆管理
@@ -39,9 +47,12 @@
             " 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;'>" +
+            " 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} " +
@@ -52,4 +63,37 @@
             " 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);
+
+
+
+    @Select("<script> " +
+            " SELECT  " +
+            "  t.area_name AS areaName,  " +
+            "  t.user_name AS userName,  " +
+            "  t.brand,  " +
+            "  t.plate_num AS plateNum,  " +
+            "  t.color,  " +
+            "  t.mobile,  " +
+            "  t.address " +
+            "FROM  " +
+            "  com_mng_car t where 1=1 " +
+            "<if test='exportComMngCarExcelDTO.areaName != null and exportComMngCarExcelDTO.areaName.trim() != &quot;&quot;'>" +
+            " and t.area_name LIKE concat( #{exportComMngCarExcelDTO.areaName}, '%' )  " +
+            " </if> " +
+            "<if test='exportComMngCarExcelDTO.communityId != null and exportComMngCarExcelDTO.communityId != 0'>" +
+            " and t.community_id = #{exportComMngCarExcelDTO.communityId} " +
+            " </if> " +
+            "<if test='exportComMngCarExcelDTO.userName != null and exportComMngCarExcelDTO.userName.trim() != &quot;&quot;'>" +
+            " and t.user_name LIKE concat( #{exportComMngCarExcelDTO.userName}, '%' )  " +
+            " </if> " +
+            " order by t.create_at desc" +
+            "</script>")
+    List<ComMngCarExcelVO> exportRealCar(@Param(value = "exportComMngCarExcelDTO") ExportComMngCarExcelDTO exportComMngCarExcelDTO);
+
+
 }

--
Gitblit v1.7.1