From 2ff68802d432b0a0358814e0c1820b95a2a92e03 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期六, 20 二月 2021 09:50:33 +0800
Subject: [PATCH] all

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 3090be0..02d790b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -75,8 +75,12 @@
             "SELECT\n" +
             "u.user_id,\n" +
             "u.`name`,\n" +
+            "u.`sex`,\n" +
             "u.nick_name,\n" +
             "u.phone,\n" +
+            "YEAR (now()) - YEAR (substring(u.id_card, 7, 8)) age,\n"+
+            "1 isRegister,\n"+
+            "v.political_face political_outlook,\n"+
             "u.id_card,\n" +
             "u.job,\n" +
             "c.area_name communityName,\n" +
@@ -84,10 +88,11 @@
             "u.create_at \n" +
             "FROM\n" +
             "sys_user u\n" +
-            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
+            "left join com_mng_volunteer_mng v on u.phone=v.phone \n"+
+            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
             " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
             " </if> " +
-            "<if test='loginUserInfoVO.name == null or loginUserInfoVO.name.trim() == &quot;&quot;'>" +
+            "<if test='loginUserInfoVO.communityName == null or loginUserInfoVO.communityName.trim() == &quot;&quot;'>" +
             "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
             " </if> " +
             "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
@@ -99,6 +104,45 @@
             " </if> " +
             "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
             "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
+            " </if> " +
+
+            "union all "+
+            "SELECT \n" +
+            "u.id+100000000 user_id,\n" +
+            "u.`name`,\n" +
+            "case if(length(u.id_card)=18, cast(substring(u.id_card,17,1) as UNSIGNED)%2, if(length(u.id_card)=15,cast(substring(u.id_card,15,1) as UNSIGNED)%2,3)) \n" +
+            "when 1 then 1\n" +
+            "when 0 then 2\n" +
+            "else 0\n" +
+            "end as sex,\n" +
+            "'' nick_name,\n" +
+            "u.phone,\n" +
+            "YEAR (now()) - YEAR (substring(u.id_card, 7, 8)) age,\n" +
+            "if(su.user_id is null ,0,1)isRegister,\n" +
+            "u.political_outlook,\n" +
+            "u.id_card,\n" +
+            "'' job,\n" +
+            "c.area_name communityName,\n" +
+            "CONCAT(if(u.soldier=1,'军人,',''),if(u.lowIncome_households=1,'低保户,',''),if(u.lowIncome_people=1,'低收入,',''),if(u.old_people=1,'特服家庭,',''),if(u.key_personnel=1,'重点人员,',''))tags,\n" +
+            "u.create_at\n" +
+            "FROM\n" +
+            "\tsys_user_input u\n" +
+            "\tLEFT JOIN sys_user su on su.id_card=u.id_card"+
+            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
+            " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
+            " </if> " +
+            "<if test='loginUserInfoVO.communityName == null or loginUserInfoVO.communityName.trim() == &quot;&quot;'>" +
+            "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
+            " </if> " +
+            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
+            "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')  \n" +
+            " </if> " +
+            " where u.community_id=#{loginUserInfoVO.communityId} " +
+            "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
+            "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
+            " </if> " +
+            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
+            " and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
             " </if> " +
             "</script>")
     IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
@@ -243,4 +287,14 @@
     int updateFaceState(Long userId);
     @Select("select name from com_act where community_id=#{communityId}")
     ComActVO selectCommunity(Long communityId);
+    @Select("select COUNT(a.id) from com_mng_struct_area a where a.area_name=#{areaName}")
+    Integer selectCountArea(String areaName);
+    @Select("SELECT\n" +
+            "\tCOUNT(h.id)\n" +
+            "FROM\n" +
+            "\tcom_mng_struct_area a \n" +
+            "\tLEFT JOIN com_mng_struct_house h on  h.parent_code=a.area_code\n" +
+            "WHERE\n" +
+            "\ta.area_name = #{areaName}")
+    Integer selectCountHouse(String areaName);
 }

--
Gitblit v1.7.1