From 79d022f98239e5f029bdca3adf38ca4a39e15143 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 14 九月 2022 16:14:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitang_dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java
index 1e3571f..b5595c9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java
@@ -2,9 +2,15 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO;
+import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
+import com.panzhihua.common.model.vos.sanshuo.ComEventDetailVO;
 import com.panzhihua.service_community.entity.ComEvent;
+import com.panzhihua.service_community.entity.SysUser;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -67,4 +73,18 @@
      * @date 2022-09-07 11:23:51
      */
     R updateEnabled(Long id, Boolean enabled);
+
+    R conciliationEvent(ComEventConciliationVO comEventConciliationVO);
+
+    R cancelRequest(Long id );
+
+    HashMap detail(String id);
+
+    R acceptRequest(Long id,Long specterId);
+
+    R reappoint(Long id, Long specialistId);
+
+    R calculate();
+
+    R archiveRequest(ComEventArchiveVO comEventArchiveVO, LoginUserInfoVO sysUser);
 }

--
Gitblit v1.7.1