From 6424521a768125e66b64a23d2094e05eb95b105f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 08 十月 2021 11:30:14 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 59 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 19 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 7ae69d9..d72079a 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
@@ -5,7 +5,8 @@
import java.util.Map;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
-import com.panzhihua.common.model.vos.community.VillageVO;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.*;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -23,8 +24,6 @@
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.area.AreaAddressVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationTotalVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilPopulationStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.*;
@@ -143,18 +142,12 @@
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 "
- + "left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id "
- + "where cmpct.community_id = #{pageInputUserDTO.communityId} and cmpct.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 cmpct.label like concat('%',#{pageInputUserDTO.tags},'%') " + " </if> "
- + " order by cmp.create_at desc " + "</script>")
+ /**
+ * 分页查询特殊群体列表
+ * @param page 分页参数
+ * @param pageInputUserDTO 请求参数
+ * @return 特殊群体列表
+ */
IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);
@Select("<script> "
@@ -181,21 +174,23 @@
AreaAddressVO getAreaAddress(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode,
@Param("districtCode") String districtCode);
- @Select("select count(id) as populationTotal "
+ @Select("select count(cmpct.id) as populationTotal "
+ ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 1) as localTotal "
+ ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 2) as outTotal "
- + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and IFNULL(cmpct.label,'') != '') as specialTotal "
+ + ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmpct.label is not null) as specialTotal "
+ ",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal "
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal "
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal "
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','精神障碍患者','%')) as majorTotal "
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','邪教人员','%')) as cultTotal "
- + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','刑满释放','%')) as rehabilitationTotal "
+ + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','刑释人员','%')) as rehabilitationTotal "
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','重点人员','%')) as keyTotal "
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','退役军人','%')) as veteransTotal "
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','残疾人','%')) as disabilityTotal "
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','低保户','%')) as lowSecurityTotal "
- + " from com_mng_population_community_tags as cmpct where community_id = #{communityId}")
+ + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','高龄老人','%')) as elderTotal "
+ + ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','养老金人员','%')) as pensionTotal "
+ + " from com_mng_population_community_tags as cmpct inner join com_mng_population as cmp on cmp.id = cmpct.population_id where community_id = #{communityId}")
ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);
@Select("select count(id) as populationTotal," +
@@ -594,6 +589,12 @@
+ "</foreach>" + " </script>")
Integer getPopulationVisitingCount(@Param("ids") List<Long> ids);
+ /**
+ * 综治后台删除居民，并清理人口与社区绑定关系
+ * @param ids 需要删除的人口id集合
+ */
+ void deletePopulaitonRelation(@Param("ids") List<Long> ids);
+
@Select("<script> " + "SELECT " + " cmp.id, " + " cmp.`name`, " + " cmp.card_no as idCard, "
+ " cmpct.label, " + " cmp.sex, " + " IFNULL( cmp.phone, '暂无' ) as phone, " + " cmp.address, "
+ " cmp.political_outlook " + " FROM "
@@ -685,4 +686,24 @@
* @return
*/
List<VillageVO> getSecondHouseAddress(Long communityId);
+
+ /**
+ * 房屋二级联动后台
+ * @param communityId
+ * @return
+ */
+ List<VillageVO> getSecondHouse(Long communityId);
+
+ /**
+ * 四长四员分页查询
+ * @param page
+ * @param commonPage
+ * @return
+ */
+ IPage<ComMngPopulationNoSecretVO> query(Page page, @Param("commonPage") CommonPage commonPage);
+
+ /**
+ * 居民详情
+ */
+ ComMngPopulationDetailVO getById(Long id);
}
--
Gitblit v1.7.1