From dba27fcf4714a1f4153621c610a9342c60b47c77 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 09 六月 2022 17:34:32 +0800
Subject: [PATCH] 人大修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml              |   15 ++++++++-------
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java |    2 ++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java
index 911c325..f409221 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BaseInfo.java
@@ -26,5 +26,7 @@
     private Integer volunteer;
     @ApiModelProperty("党组织")
     private Integer partyOrg;
+    @ApiModelProperty("人大代表")
+    private Integer dpcNum;
 }
 
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
index 80e0342..75c9ddc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
@@ -1118,13 +1118,14 @@
 
     <select id="baseInfo" resultType="com.panzhihua.common.model.vos.community.bigscreen.BaseInfo">
         select count(id) as population,
-               IFNULL((select count(id) from com_mng_population_house where community_id = ${communityId}),0) as house,
-               IFNULL((select count(id) from com_mng_real_company where community_id = ${communityId}),0) as company,
-               IFNULL((select count(DISTINCT `name`) from com_mng_village where community_id = ${communityId}),0) as village,
-               IFNULL((select count(user_id) from sys_user where community_id = ${communityId} and type=1),0) as user,
-						IFNULL((select count(id) from com_pb_member where community_id = ${communityId} and audit_result =1 ),0) as partyMember,
-						IFNULL((select count(id) from com_mng_volunteer_mng where community_id = ${communityId} and state=2 ),0) as volunteer,
-						IFNULL((select count(id) from com_pb_org where community_id = ${communityId} and parent_id = 0),0) as partyOrg
+            IFNULL((select count(id) from com_mng_population_house where community_id = ${communityId}),0) as house,
+            IFNULL((select count(id) from com_mng_real_company where community_id = ${communityId}),0) as company,
+            IFNULL((select count(DISTINCT `name`) from com_mng_village where community_id = ${communityId}),0) as village,
+            IFNULL((select count(user_id) from sys_user where community_id = ${communityId} and type=1),0) as user,
+            IFNULL((select count(id) from com_pb_member where community_id = ${communityId} and audit_result =1 ),0) as partyMember,
+            IFNULL((select count(id) from com_mng_volunteer_mng where community_id = ${communityId} and state=2 ),0) as volunteer,
+            IFNULL((select count(id) from com_pb_org where community_id = ${communityId} and parent_id = 0),0) as partyOrg,
+            IFNULL((select count(id) from com_act_dpc where community_id = ${communityId} AND is_del = 0),0) as dpcNum
         from com_mng_population_community_tags AS cmpct
         where cmpct.community_id = ${communityId}
     </select>

--
Gitblit v1.7.1