From 2310f7cc5ec35d2b92eeb3b8be359a48a6c30f6c Mon Sep 17 00:00:00 2001
From: Null <281575458@qq.com>
Date: 星期六, 20 三月 2021 17:04:54 +0800
Subject: [PATCH] 一标三实接口修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java | 94 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 79 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java
index a6fee95..fbbdaf3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java
@@ -3,6 +3,7 @@
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.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
@@ -63,6 +64,7 @@
@Select("<script> " +
"SELECT " +
+ " t.id, " +
" t.`name`, " +
"CASE " +
" IF " +
@@ -119,22 +121,10 @@
@Select("select a.id,a.community_id,a.area_name,address_detail from com_mng_struct_area a where a.community_id=#{communityId}")
List<ComMngStructAreaVO> selectComMngStructArea(@Param("communityId") Long communityId);
- @Select("" +
- "SELECT " +
- " t1.house_code houseCode, " +
- " t1.house_name houseName, " +
- " t1.square, " +
- " t1.state " +
- "FROM " +
- " sys_user_input t " +
- " LEFT JOIN com_mng_struct_house t1 ON t.house_code = t1.house_code " +
- " WHERE" +
- " t.id_card = #{idCard}")
- List<ComMngStructHouseVO> selectUserHouseList(@Param("idCard") String idCard);
-
@Select("<script> " +
"SELECT * FROM ( "+
" SELECT " +
+ " t.id, " +
" t.`name`, " +
"CASE " +
" IF " +
@@ -170,10 +160,12 @@
" ( t.key_personnel = 1, '重点人员,', '' ), " +
" IFNULL(t.tags,'') " +
" ) tags, " +
+ " t2.house_name as address, " +
" t.create_at as createAt " +
"FROM " +
" sys_user_input t " +
" LEFT JOIN com_mng_struct_area t1 ON t.area_id = t1.id " +
+ " LEFT JOIN com_mng_struct_house t2 ON t.house_code = t2.house_code " +
"WHERE " +
" t.community_id = #{pageInputUserDTO.communityId}"+
" AND " +
@@ -195,9 +187,23 @@
"</script>")
IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);
+ @Select("" +
+ "SELECT " +
+ " t1.house_code houseCode, " +
+ " t1.house_name houseName, " +
+ " t1.square, " +
+ " t1.state " +
+ "FROM " +
+ " sys_user_input t " +
+ " LEFT JOIN com_mng_struct_house t1 ON t.house_code = t1.house_code " +
+ " WHERE" +
+ " t.id_card = #{idCard}")
+ List<ComMngStructHouseVO> selectUserHouseList(@Param("idCard") String idCard);
+
@Select("<script> " +
"SELECT " +
"u.id 'order', " +
+ "c.`area_name` areaName, "+
"u.door_number doorNumber, " +
"if(u.is_rent=1,'租住','自主')isRent, " +
"u.name, " +
@@ -220,9 +226,10 @@
"if(u.old_people=1,'是','否') oldPeople, " +
"if(u.special_service_family=1,'是','否') specialServiceFamily, " +
"if(u.key_personnel=1,'是','否') keyPersonnel " +
+ "u.tags " +
"FROM " +
" sys_user_input u " +
- " LEFT JOIN sys_user su on su.id_card=u.id_card"+
+ " where u.community_id=#{exportUserDTO.communityId} " +
"<if test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != ""'>" +
" JOIN com_mng_struct_area c ON u.area_id = c.id " +
" </if> " +
@@ -232,7 +239,6 @@
"<if test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != ""'>" +
"AND c.`area_name` like concat(#{exportUserDTO.areaName},'%') " +
" </if> " +
- " where u.community_id=#{exportUserDTO.communityId} " +
"<if test='exportUserDTO.phone != null and exportUserDTO.phone.trim() != ""'>" +
"AND u.phone like concat(#{exportUserDTO.phone},'%') " +
" </if> " +
@@ -241,4 +247,62 @@
" </if> " +
"</script>")
List<EexcelUserDTO> selectExport(@Param("exportUserDTO") ExportUserDTO exportUserDTO);
+
+ @Select("<script> " +
+ "SELECT " +
+ "u.id 'order', " +
+ "c.`area_name` areaName, "+
+ "u.door_number doorNumber, " +
+ "if(u.is_rent=1,'租住','自主')isRent, " +
+ "u.name, " +
+ "u.nation, " +
+ "case u.political_outlook when 1 then '党员' when 2 then '团员' else '群众' end politicalOutlook, " +
+ "if(u.marital_status=1,'已婚','未婚')maritalStatus, " +
+ "u.phone, " +
+ "u.education, " +
+ "u.id_card, " +
+ "u.company, " +
+ "u.residence, " +
+ "if(u.is_panzhiHua=1,'是','否') isPanZhiHua, " +
+ "u.situation, " +
+ "if(is_contact=1,'是','否') isContact, " +
+ "if(u.major=1,'是','否') major, " +
+ "if(u.soldier=1,'是','否') soldier, " +
+ "if(u.disability=1,'是','否') disability, " +
+ "if(u.lowIncome_households=1,'是','否') lowIncomeHouseholds, " +
+ "if(u.lowIncome_people=1,'是','否') lowIncomePeople, " +
+ "if(u.old_people=1,'是','否') oldPeople, " +
+ "if(u.special_service_family=1,'是','否') specialServiceFamily, " +
+ "if(u.key_personnel=1,'是','否') keyPersonnel " +
+ "u.tags " +
+ "FROM " +
+ " sys_user_input u " +
+ " JOIN com_mng_struct_area c ON u.area_id = c.id " +
+ " where u.community_id=#{exportSpecialUserDTO.communityId} " +
+ "<if test='exportSpecialUserDTO.areaName != null and exportSpecialUserDTO.areaName.trim() != ""'>" +
+ "AND c.`area_name` like concat(#{exportUserDTO.areaName},'%') " +
+ " </if> " +
+ "<if test='exportSpecialUserDTO.name != null and exportSpecialUserDTO.name.trim() != ""'>" +
+ " and u.`name` like concat(#{exportSpecialUserDTO.name},'%') " +
+ " </if> " +
+ "<if test='exportSpecialUserDTO.name != null and exportSpecialUserDTO.name.trim() != ""'>" +
+ " and u.`name` like concat(#{exportSpecialUserDTO.name},'%') " +
+ " </if> " +
+ "<if test='exportSpecialUserDTO.tags != null and exportSpecialUserDTO.tags.trim() != ""'>" +
+ " CONCAT( " +
+ " IF " +
+ " ( t.soldier = 1, '军人,', '' ), " +
+ " IF " +
+ " ( t.lowIncome_households = 1, '低保户,', '' ), " +
+ " IF " +
+ " ( t.lowIncome_people = 1, '低收入,', '' ), " +
+ " IF " +
+ " ( t.old_people = 1, '特服家庭,', '' ), " +
+ " IF " +
+ " ( t.key_personnel = 1, '重点人员,', '' ), " +
+ " IFNULL(t.tags,'') " +
+ " ) like concat(#{exportSpecialUserDTO.tags},'%')"+
+ " </if> " +
+ "</script>")
+ List<EexcelUserDTO> specialUserExport(@Param("exportSpecialUserDTO") ExportSpecialUserDTO exportSpecialUserDTO);
}
--
Gitblit v1.7.1