huanghongfa
2021-12-15 5ea8f496a9bc1fc33ecf12d0055efa157d070290
Merge remote-tracking branch 'origin/master'
2个文件已修改
19 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/WestScreenStatics.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/WestScreenStatics.java
@@ -26,4 +26,6 @@
    private Integer activity;
    @ApiModelProperty("疫情防控")
    private Integer reserve;
    @ApiModelProperty("邻里圈")
    private Integer neighbor;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
@@ -816,15 +816,18 @@
    <select id="westScreenStatics" resultType="com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics">
        select  ( SELECT    count( id ) FROM    com_act_micro_wish AS camw    WHERE    camw.STATUS = 6 ) microWish ,
        select  ( SELECT    count(*) FROM    com_act_micro_wish AS camw  LEFT JOIN com_act t1 on camw.community_id = t1.community_id
                  where t1.area_code ='510423'  and    camw.STATUS = 6 ) microWish ,
                (select count(user_id) from sys_user t LEFT JOIN com_act t1 on t.community_id = t1.community_id
                 where t.type=1 and t.community_id is not null and t1.area_code ='510423') user,
                (select count(id) from com_pb_org where parent_id = 0) partyOrg,
                (select count(id) from com_pb_member where audit_result = 1) partyMember,
                (select count(id) from com_mng_volunteer_mng where  state = 2)  volunteer,
                (select count(id) from com_sw_patrol_record) safety,
                (select count(*) from com_act_reserve t LEFT JOIN com_act_reserve_record t1 on t.id = t1.reserve_id where title like '%居家隔离%' or title like  '%返攀登记%' and t1.status = 2 )  reserve,
                (select count(*) from com_act_activity where status !=6) activity
                (select count(id) from com_pb_org t LEFT JOIN com_act t1 on t.community_id = t1.community_id where parent_id = 0 and t1.area_code ='510423') partyOrg,
                (select count(id) from com_pb_member t LEFT JOIN com_act t1 on t.community_id = t1.community_id where audit_result = 1 and t1.area_code ='510423') partyMember,
                (select count(id) from com_mng_volunteer_mng t LEFT JOIN com_act t1 on t.community_id = t1.community_id where  t.state = 2 and t1.area_code ='510423')  volunteer,
                (select count(id) from com_sw_patrol_record t LEFT JOIN com_act t1 on t.community_id = t1.community_id where   t1.area_code ='510423') safety,
                (select count(*) from com_act_reserve t LEFT JOIN com_act_reserve_record t1 on t.id = t1.reserve_id LEFT JOIN com_act t2 on t.community_id = t2.community_id       where (title like '%居家隔离%' or title like  '%返攀登记%' or title like  '%来攀登记%') and t2.area_code ='510423' and t1.status = 2  )  reserve,
                (select (select count(*) from com_act_activity t LEFT JOIN com_act t1 on t.community_id = t1.community_id  where status !=6 and status !=1 and  t1.area_code ='510423')+(select count(id) from com_pb_activity t LEFT JOIN com_act t1 on t.community_id = t1.community_id  where status !=6 and status !=1 and  t1.area_code ='510423')) activity,
                (select count(*) from com_act_neighbor_circle t LEFT JOIN com_act t1 on t.community_id = t1.community_id
                where     is_del =2 and status=2 and t1.area_code ='510423') neighbor
        </select>
    <select id="getBasicsList" resultType="com.panzhihua.common.model.vos.community.screen.event.EventPopulationBasicsStatisticsVO">