From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventMapper.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventMapper.java
index a3a8231..3014a01 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComEventMapper.java
@@ -6,11 +6,14 @@
import com.panzhihua.common.model.dtos.community.sanshuo.IndexDateDTO;
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventCalculateVO;
+import com.panzhihua.common.model.vos.sanshuo.EventRateVO;
import com.panzhihua.common.model.vos.sanshuo.IndexDateVO;
+import com.panzhihua.common.model.vos.sanshuo.MediateTypeVO;
import com.panzhihua.service_community.entity.ComEvent;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
/**
* 三说会堂事件表Mapper
@@ -31,6 +34,13 @@
* @date 2022-09-07 11:23:51
*/
IPage<ComEvent> pageByComEvent(@Param("comEvent") ComEvent comEvent, Page pagination);
+ IPage<ComEvent> pageByComEventExpert(@Param("eventIds") List<Long> eventIds,@Param("comEvent") ComEvent comEvent, Page pagination);
+ /**
+ *
+ * 获取专家名下的所有事件id
+ * @param expertId 专家id
+ * */
+ List<Long> listEventIds(Long expertId);
/**
* description 三说会堂事件表列表数据
*
@@ -39,7 +49,7 @@
* @author manailin
* @date 2022-09-07 11:23:51
*/
- List<ComEvent> listByComEvent(@Param("comEvent") ComEvent comEvent);
+ List<ComEvent> listByComEvent(@Param("comEvent") ComEvent comEvent,@Param("requestUserId") Long requestUserId);
List<ComEventCalculateVO> calculate();
@@ -49,7 +59,7 @@
* @return 处理结果
* @author zhangtiansen
* */
- IndexDateVO dateAnalysis(@Param("dto") IndexDateDTO indexDateDTO);
+ IndexDateVO dateAnalysis(@Param("dto") IndexDateDTO indexDateDTO,@Param("beginDate") Date beginDate, @Param("endDate")Date endDate);
/**
@@ -58,7 +68,7 @@
* @param endDate 结束时间
* @author zhangtiansen
* */
- Integer dateAnalysisY(@Param("beginDate")String beginDate,@Param("endDate")String endDate);
+ Integer dateAnalysisY(@Param("beginDate") Date beginDate, @Param("endDate")Date endDate, @Param("dto") IndexDateDTO indexDateDTO);
/**
* 大屏事件统计-月办结
@@ -66,5 +76,35 @@
* @param endDate 结束时间
* @author zhangtiansen
* */
- Integer dateAnalysisYTwo(@Param("beginDate")String beginDate,@Param("endDate")String endDate);
+ Integer dateAnalysisYTwo(@Param("beginDate")Date beginDate,@Param("endDate")Date endDate,@Param("dto") IndexDateDTO indexDateDTO);
+
+ /**
+ * 大屏事件级别统计
+ * */
+ List<EventRateVO> eventRate();
+
+ /**
+ * 大屏统计-专家级别占比
+ * */
+ List<EventRateVO> expertRate();
+
+ /**
+ * 大屏统计-事件类型占比
+ * */
+ List<EventRateVO> mediateTypeRate();
+
+ /**
+ * 获取用户头像
+ * */
+ String getUserAvatar(Long userId);
+
+ /**
+ * 添加事件-专家对应记录
+ * @param status 流转状态（
+ * 0创建时分配，只有一条记录
+ * 1上报后重新分配
+ * 2拒绝后重新分配
+ * ）
+ * */
+ void insertEventAndExpertRecord(@Param("eventId") Long eventId, @Param("expertId") Long experId,@Param("status")Integer status);
}
--
Gitblit v1.7.1