From a3aa71fd0ba1b48fe52f080e8d2776f50c5ed514 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 27 四月 2021 11:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index 15b6e14..09a603e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.community.ComActMessageVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.PageComActMessageVO;
+import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.InputUserInfoVO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -92,6 +95,9 @@
@Select("select id,user_id,relationship,`name`,id_card,phone,age,health,job,create_at,update_at from com_mng_family_info where user_id=#{userId}")
List<ComMngFamilyInfoVO> listFamilyByUserId(Long userId);
+ @Select("select id,`name`,phone,relation from com_mng_population where road = #{comMngPopulationDO.road} and door_no = #{comMngPopulationDO.doorNo} and floor = #{comMngPopulationDO.floor} and unit_no = #{comMngPopulationDO.unitNo} and house_no = #{comMngPopulationDO.houseNo} and id != #{comMngPopulationDO.id}")
+ List<ComHouseMemberVo> listHouseMermberByUserId(@Param("comMngPopulationDO") ComMngPopulationDO comMngPopulationDO);
+
@Select("<script> " +
"SELECT\n" +
"cmp.`name`,\n" +
@@ -121,19 +127,22 @@
"com_mng_population AS cmp " +
"LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " +
"<where>" +
- "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name.trim() != ""'>" +
+ "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name != ""'>" +
"AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
" </if> " +
- "<if test='comMngPopulationVO.road != null and comMngPopulationVO.road.trim() != ""'>" +
+ "<if test='comMngPopulationVO.actId != null'>" +
+ " and cmp.act_id = #{comMngPopulationVO.actId} " +
+ " </if> " +
+ "<if test='comMngPopulationVO.road != null and comMngPopulationVO.road != ""'>" +
"AND cmp.road LIKE concat(#{comMngPopulationVO.road},'%') " +
" </if> " +
- "<if test='comMngPopulationVO.doorNo != null and comMngPopulationVO.doorNo.trim() != ""'>" +
+ "<if test='comMngPopulationVO.doorNo != null and comMngPopulationVO.doorNo != ""'>" +
"AND cmp.door_no = #{comMngPopulationVO.doorNo} " +
" </if> " +
- "<if test='comMngPopulationVO.alley != null and comMngPopulationVO.alley.trim() != ""'>" +
+ "<if test='comMngPopulationVO.alley != null and comMngPopulationVO.alley != ""'>" +
"AND cmv.alley LIKE concat(#{comMngPopulationVO.alley},'%') " +
" </if> " +
- "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex.trim() != ""'>" +
+ "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex != ""'>" +
"AND cmp.sex = #{comMngPopulationVO.sex} " +
" </if> " +
"<if test='comMngPopulationVO.ageStart != null'>" +
@@ -142,26 +151,40 @@
"<if test='comMngPopulationVO.ageEnd != null'>" +
"AND cmp.age <![CDATA[ <= ]]> #{comMngPopulationVO.ageEnd} " +
" </if> " +
- "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace.trim() != ""'>" +
+ "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != ""'>" +
"AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " +
" </if> " +
- "<if test='comMngPopulationVO.nation != null and comMngPopulationVO.nation.trim() != ""'>" +
+ "<if test='comMngPopulationVO.nation != null and comMngPopulationVO.nation != ""'>" +
"AND cmp.nation = #{comMngPopulationVO.nation} " +
" </if> " +
- "<if test='comMngPopulationVO.politicalOutlook != null and comMngPopulationVO.politicalOutlook.trim() != ""'>" +
+ "<if test='comMngPopulationVO.politicalOutlook != null and comMngPopulationVO.politicalOutlook != ""'>" +
"AND cmp.political_outlook = #{comMngPopulationVO.politicalOutlook} " +
" </if> " +
- "<if test='comMngPopulationVO.cardNo != null and comMngPopulationVO.cardNo.trim() != ""'>" +
+ "<if test='comMngPopulationVO.cardNo != null and comMngPopulationVO.cardNo != ""'>" +
"AND cmp.card_no = #{comMngPopulationVO.cardNo} " +
" </if> " +
- "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark.trim() != ""'>" +
+ "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark != ""'>" +
"AND cmp.remark = #{comMngPopulationVO.remark} " +
" </if> " +
" </where>" +
"</script>")
IPage<ComMngPopulationVO> pagePopulation(Page page, @Param("comMngPopulationVO") ComMngPopulationDTO comMngPopulationVO);
-
+ @Select("<script> " +
+ "select cmp.id,cmv.`alley` as areaName,cmp.`name`,cmp.phone,cmp.label as tags,cmp.create_at from com_mng_population as cmp " +
+ "left join com_mng_village as cmv on cmv.village_id = cmp.village_id where cmp.act_id = #{pageInputUserDTO.communityId} and cmp.label is not null " +
+ "<if test='pageInputUserDTO.name != null and pageInputUserDTO.name != ""'>" +
+ " AND cmp.`name` LIKE concat(#{pageInputUserDTO.name},'%') " +
+ " </if> " +
+ "<if test='pageInputUserDTO.areaName != null and pageInputUserDTO.areaName != ""'>" +
+ " AND cmv.`alley` LIKE concat(#{pageInputUserDTO.areaName},'%') " +
+ " </if> " +
+ "<if test='pageInputUserDTO.tags != null and pageInputUserDTO.tags != ""'>" +
+ " AND cmp.label like concat('%',#{pageInputUserDTO.tags},'%') " +
+ " </if> " +
+ " order by cmp.create_at desc " +
+ "</script>")
+ IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);
}
--
Gitblit v1.7.1