From 0430cf26ba8646c65ffb1d1a0fbdb191a8c29d74 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 17 十一月 2022 16:30:02 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerService.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerService.java
index 2b6a62f..f38fed1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerService.java
@@ -51,7 +51,27 @@
* @param id 社工 id
* @return 查找结果
*/
- R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(Long id);
+ R<ComActSocialWorkerVO> comActSocialWorkerDetails(Long id);
+ /**
+ * 导出
+ * @param lis
+ * @param communityId
+ * @return
+ */
R export(List<ComActSocialWorkerExcelVO> lis, Long communityId);
+
+ /**
+ * 查询活动社工
+ * @param commonPage
+ * @return
+ */
+ R activity(CommonPage commonPage);
+
+ /**
+ * 根据社工查询活动
+ * @param commonPage
+ * @return
+ */
+ R activityList(CommonPage commonPage);
}
--
Gitblit v1.7.1