From 8da7ca5f5a5466c76b0d0abe23c7935e13e09136 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 12:50:34 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java
index f9727ed..98016d2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java
@@ -14,7 +14,7 @@
      * @param comSanshuoExpertDTO
      * @return 处理结果
      * */
-    R addExpert(ComSanshuoExpertDTO comSanshuoExpertDTO);
+    R addOrUpdateExpert(ComSanshuoExpertDTO comSanshuoExpertDTO);
 
     /**
      * 后台获取专家列表
@@ -23,13 +23,13 @@
      * @param size
      * @return 处理结果
      * */
-    R expertPage(String keyWord, Integer page, Integer size, LoginUserInfoVO loginUserInfo);
+    R expertPage(String keyWord, Integer page, Integer size, LoginUserInfoVO loginUserInfo,Integer level);
 
     /**
      * 专家风采列表
      * @return 出列记过
      * */
-    R expertShow();
+    R expertShow(String appId);
 
     /**
      * 专家级别与单位范围
@@ -44,5 +44,20 @@
     /**
      * 专家风采列表
      * */
-    R expertShowList(Integer level, Long id);
+    R expertShowList(Integer level, Long id,String appId);
+
+    /**
+     * Excel添加专家
+     * */
+    void insertExpert(ComSanshuoExpert comSanshuoExpert);
+
+    /**
+     * 新增专家后台列表
+     * */
+    R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO,Integer page,Integer size,String keyWord);
+
+    /**
+     * 事件范围筛选列表
+     * */
+    R rangeList();
 }

--
Gitblit v1.7.1