From eef6d2bcdb29348efe4ef17bc45a4c6886b487b1 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 11 七月 2024 18:16:26 +0800
Subject: [PATCH] 花城 【小程序】统计排行添加是否是问题清单标识5

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
index 20af7cd..6e87d4c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -6,6 +6,7 @@
 import com.panzhihua.common.model.dtos.PageBaseDTO;
 import com.panzhihua.common.model.vos.community.StatisticsCommVO;
 import com.panzhihua.common.model.vos.neighbor.*;
+import com.panzhihua.service_community.entity.NewFightNeedProblemClaim;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -45,7 +46,16 @@
 
     ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId);
 
+
     IPage<ComActNeighborCircleAdminVO> pageNeighborByAdmin(Page page,@Param("neighborCircleAdminDTO") ComActNeighborCircleAdminDTO neighborCircleAdminDTO);
+
+    /**
+     * 大屏清单查询
+     * @param page
+     * @param neighborCircleAdminDTO
+     * @return
+     */
+    IPage<ComActNeighborCircleAdminVO> pageNeighborByBigScreen(Page page,@Param("neighborCircleAdminDTO") ComActNeighborCircleAdminDTO neighborCircleAdminDTO);
 
     @Select("select * from sys_user where user_id=#{userId}")
     AdministratorsUserVO selectUserByUserId(@Param("userId") Long userId);
@@ -87,7 +97,7 @@
         + "UNION ALL "
         + "SELECT COUNT(id) as num,'一起议' as name FROM com_act_discuss WHERE community_id = ${communityId} "
         + "UNION ALL "
-        + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND STATUS = 2 and belong_type = 1"
+        + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND STATUS = 2 and belong_type = 1 "
         + "UNION ALL "
         + "SELECT COUNT( e.id ) AS num,'网格事件' AS name FROM `event` as e left join event_grid_data as egd on egd.id = e.grid_id WHERE egd.grid_community_id = ${communityId} AND e.event_process_status = 2 "
         + "UNION ALL "
@@ -100,7 +110,7 @@
         + "UNION ALL "
         + "SELECT COUNT(id) as num,'一起议' as name FROM com_act_discuss WHERE community_id = ${communityId} "
         + "UNION ALL "
-        + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND STATUS = 1 and belong_type = 1"
+        + "SELECT COUNT(id) as num,'邻里圈' as name FROM com_act_neighbor_circle WHERE community_id = ${communityId} AND STATUS = 1 and belong_type = 1 "
         + "UNION ALL "
         + "SELECT COUNT( e.id ) AS num,'网格事件' AS NAME FROM `event` as e left join event_grid_data as egd on egd.id = e.grid_id WHERE egd.grid_community_id = ${communityId} AND e.event_status = 2 and e.event_deal_status in (1,2,3) "
         + "UNION ALL "
@@ -155,8 +165,19 @@
     List<UnitActivityAnalysisVO> institutionalUnitServiceAnalysis(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo,@Param("communityId") Long communityId);
     List<UnitActivityAnalysisVO> institutionalUnitActivityAnalysis(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo,@Param("communityId") Long communityId);
 
-    List<PartyMemberAnalysisVO> institutionalPartyMemberServiceAnalysis(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo,@Param("communityId") Long communityId,@Param("unitId") Long unitId);
-    List<PartyMemberAnalysisVO> institutionalPartyMemberActAnalysis(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo,@Param("communityId") Long communityId,@Param("unitId") Long unitId);
+    List<PartyMemberAnalysisVO> institutionalPartyMemberServiceAnalysis(@Param("beginTime") String beginTime,
+                                                                        @Param("endTime") String endTIme,
+                                                                        @Param("belongTo") String belongTo,
+                                                                        @Param("communityId") Long communityId,
+                                                                        @Param("unitId") Long unitId,
+                                                                        @Param("searchContent") String searchContent
+                                                                        );
+    List<PartyMemberAnalysisVO> institutionalPartyMemberActAnalysis(@Param("beginTime") String beginTime,
+                                                                    @Param("endTime") String endTIme,
+                                                                    @Param("belongTo") String belongTo,
+                                                                    @Param("communityId") Long communityId,
+                                                                    @Param("unitId") Long unitId,
+                                                                    @Param("searchContent") String searchContent);
     List<PartyMemberAnalysisVO> institutionalPartyMemberServiceAnalysisByServicesTimes(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo);
 
     /**
@@ -192,4 +213,14 @@
      * @return
      */
     List<ServiceDetailStaticsVO> selectServiceDetailListForPersonal(@Param("checkUnitId") Long checkUnitId, @Param("phone") String phone, @Param("date") String date, @Param("serviceType") Integer serviceType);
+
+
+    /**
+     * 根据手机好查询用户完成清单任务
+     * @param phone
+     * @return
+     */
+    List<NewFightNeedProblemClaim> getNewServiceNum(@Param("phone") String phone,@Param("unitId") String unitId);
+
+
 }

--
Gitblit v1.7.1