From f3e7ecf643ec517ad93b80a50e63eaab90b6461b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 07 二月 2023 15:51:22 +0800
Subject: [PATCH] 三说会堂事件搜索修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComScreenDao.java |    2 +-
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComScreenMapper.xml                       |   28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComScreenDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComScreenDao.java
index cfb62c7..4dadb45 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComScreenDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComScreenDao.java
@@ -21,7 +21,7 @@
      * 红色物业
      * @return 处理结果
      * */
-    PropertyVO propertyData(Long community);
+    List<PropertyVO> propertyData(Long community);
 
     /**
      * 党建数据
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComScreenMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComScreenMapper.xml
index 59c67f4..a15a382 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComScreenMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComScreenMapper.xml
@@ -46,19 +46,7 @@
         WHERE
             cmb.act_id = #{communityId}
     </select>
-    <select id="ageRange" resultType="com.panzhihua.common.model.vos.puda.CitizenInfoVO">
-        SELECT count(act_id) as total,
-        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and sex='1') AS maleNum,
-        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and sex='2') AS femaleNum,
-        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and birthday BETWEEN #{vo.offset16} and #{vo.now} ) AS count1,
-        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and birthday BETWEEN #{vo.offset27} and #{vo.offset16}) AS count2,
-        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and birthday BETWEEN #{vo.offset35} and #{vo.offset27}) AS count3,
-        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and birthday BETWEEN #{vo.offset45} and #{vo.offset35}) AS count4,
-        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and birthday BETWEEN #{vo.offset55} and #{vo.offset45}) AS count5,
-        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and birthday &lt; #{vo.offset55}) AS count6
-        FROM com_mng_population
-        WHERE act_id=#{vo.communityId}
-    </select>
+
     <select id="specialPeople" resultType="com.panzhihua.common.model.vos.puda.SpecialPeopleVO">
         select count(id) as count,label from com_mng_population_community_tags
         where community_id=#{communityId}
@@ -88,7 +76,19 @@
         </where>
         order by cmb.id desc
     </select>
-
+    <select id="ageRange" resultType="com.panzhihua.common.model.vos.puda.CitizenInfoVO">
+        SELECT count(act_id) as total,
+        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and sex='1') AS maleNum,
+        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and sex='2') AS femaleNum,
+        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and birthday BETWEEN #{vo.offset16} and #{vo.now} ) AS count1,
+        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and birthday BETWEEN #{vo.offset27} and #{vo.offset16}) AS count2,
+        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and birthday BETWEEN #{vo.offset35} and #{vo.offset27}) AS count3,
+        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and birthday BETWEEN #{vo.offset45} and #{vo.offset35}) AS count4,
+        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and birthday BETWEEN #{vo.offset55} and #{vo.offset45}) AS count5,
+        (SELECT count(act_id) FROM com_mng_population WHERE  act_id=#{vo.communityId} and birthday &lt; #{vo.offset55}) AS count6
+        FROM com_mng_population
+        WHERE act_id=#{vo.communityId}
+    </select>
     <select id="buildingListHeaderStatisticsAdmin" resultType="com.panzhihua.common.model.vos.community.building.admin.BuildingListHeaderStatisticsAdminVo">
         SELECT count( id ) AS buildNum,( SELECT count( id ) FROM com_mng_population_house WHERE community_id = cmb.act_id ) AS houseNum,
         ( SELECT count( id ) FROM com_mng_population_community_tags WHERE community_id = cmb.act_id ) AS populationNum

--
Gitblit v1.7.1