From b24f9c75c79e4de248505295bfea7055e4975ff4 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 25 五月 2021 14:23:04 +0800
Subject: [PATCH] Merge branch 'lyq' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngCarDAO.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 6166fb1..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: 车辆管理
@@ -40,8 +43,11 @@
" 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 1=1" +
- "<if test='pageComMngCarDTO.name != null and pageComMngCarDTO.name.trim() != ""'>" +
+ "<if test='pageComMngCarDTO.name != null and pageComMngCarDTO.name != ""'>" +
" 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 +58,11 @@
" 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