From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 a720a6b..b769e6a 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
@@ -153,6 +153,7 @@
"cmp.label, " +
"cmp.marriage, " +
"cmp.culture_level, " +
+ "cmp.profession, " +
"cmp.out_or_local, " +
"cmp.census_register, " +
"cmp.healthy, " +
@@ -274,6 +275,15 @@
",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 2) as outTotal " +
",(select count(id) from com_mng_population where act_id = #{communityId} and 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 where act_id = #{communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','精神障碍患者','%')) as majorTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','邪教人员','%')) as cultTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','刑满释放','%')) as rehabilitationTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','重点人员','%')) as keyTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','退役军人','%')) as veteransTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','残疾人','%')) as disabilityTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','低保户','%')) as lowSecurityTotal " +
" from com_mng_population as cmp where act_id = #{communityId}")
ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);
--
Gitblit v1.7.1