From 2dbd65c087d193db8f084be2dabe5e91f54ad7a1 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 24 五月 2021 15:21:45 +0800
Subject: [PATCH] change:随手拍、一起议、微心愿 添加昵称字段

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 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 2afa610..f98dd5d 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,11 +4,14 @@
 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.common.model.vos.user.UserElectronicFileVO;
 import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -86,11 +89,12 @@
             "AND cmp.remark = #{comMngPopulationVO.remark} " +
             " </if> " +
             " </where>" +
+            " order by cmp.create_at desc " +
             "</script>")
     List<ComMngPopulationVO> listPopulation(ComMngPopulationDTO populationVO);
 
 
-    @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}")
+    @Select("select id,user_id,relationship,`name`,id_card,phone,age,health,job,create_at,update_at,card_photo_front,card_photo_back,family_book from com_mng_family_info where user_id=#{userId} order by create_at desc ")
     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}")
@@ -120,6 +124,12 @@
             "cmp.native_place,\n" +
             "cmp.nation, \n" +
             "cmp.label, \n" +
+            "cmp.relation, \n" +
+            "cmp.marriage, \n" +
+            "cmp.culture_level, \n" +
+            "cmp.out_or_local, \n" +
+            "cmp.census_register, \n" +
+            "cmp.healthy, \n" +
             "cmp.is_rent \n" +
             "FROM \n" +
             "com_mng_population AS cmp " +
@@ -143,10 +153,10 @@
             "<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex != &quot;&quot;'>" +
             "AND cmp.sex = #{comMngPopulationVO.sex} " +
             " </if> " +
-            "<if test='comMngPopulationVO.ageStart != null'>" +
+            "<if test='comMngPopulationVO.ageStart != null and comMngPopulationVO.ageStart != &quot;&quot;'>" +
             "AND cmp.age <![CDATA[ >= ]]> #{comMngPopulationVO.ageStart} " +
             " </if> " +
-            "<if test='comMngPopulationVO.ageEnd != null'>" +
+            "<if test='comMngPopulationVO.ageEnd != null and comMngPopulationVO.ageEnd != &quot;&quot;'>" +
             "AND cmp.age <![CDATA[ <= ]]> #{comMngPopulationVO.ageEnd} " +
             " </if> " +
             "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != &quot;&quot;'>" +
@@ -168,7 +178,28 @@
             "</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 != &quot;&quot;'>" +
+            " AND cmp.`name` LIKE concat(#{pageInputUserDTO.name},'%') " +
+            " </if> " +
+            "<if test='pageInputUserDTO.areaName != null and pageInputUserDTO.areaName != &quot;&quot;'>" +
+            " AND cmv.`alley` LIKE concat(#{pageInputUserDTO.areaName},'%') " +
+            " </if> " +
+            "<if test='pageInputUserDTO.tags != null and pageInputUserDTO.tags != &quot;&quot;'>" +
+            " AND cmp.label like concat('%',#{pageInputUserDTO.tags},'%') " +
+            " </if> " +
+            " order by cmp.create_at desc " +
+            "</script>")
+    IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);
 
+    @Select("select user_id,card_photo_front,card_photo_back,family_book from sys_user where id_card=#{idCard}")
+    UserElectronicFileVO getSysUserElectronicFile(@Param("idCard") String idCard);
 
+    @Select("select user_id,card_photo_front,card_photo_back,family_book from sys_user where user_id=#{userId}")
+    UserElectronicFileVO getSysUserById(@Param("userId") Long userId);
 
+    @Select("update sys_user set card_photo_front=#{vo.cardPhotoFront},card_photo_back=#{vo.cardPhotoBack},family_book=#{vo.familyBook} where user_id=#{vo.userId}")
+    void updateSysUserElectronicFile(@Param("vo") UserElectronicFileVO vo);
 }

--
Gitblit v1.7.1