From 7ee17a00bd47309ea1a61e28f2e44f621a01b8cd Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 27 四月 2022 11:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng' into huacheng
---
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