From cc595b0aa24773735417accd0158da6ac98a6db0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 六月 2022 14:47:56 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 7f9ffa5..faa159c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -5941,6 +5941,9 @@
@PostMapping("/neighbor/update")
R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
+ @PostMapping("/neighbor/serviceStatic")
+ R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);
+
/**
* 获取系统配置value
* @param key 系统配置code
@@ -9622,6 +9625,16 @@
@PostMapping("/comActAcidRecord/update")
R updateComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
+
+ /**
+ * 小程序修改填报记录
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAcidRecord/updateApplets")
+ R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
+
/**
* 删除数据
*
@@ -9630,6 +9643,18 @@
*/
@GetMapping("/comActAcidRecord/del")
R deleteComActAcidRecord(@RequestParam("id") Long id);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActAcidRecord/detailByApp")
+ R detailByApp(@RequestParam("id") Long id,@RequestParam("localCity")String localCity);
+
+ @GetMapping("/comActAcidRecord/charts")
+ R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity);
@PostMapping("/comActAcidRecord/export")
R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
@@ -9651,6 +9676,9 @@
@GetMapping("/comActAcidRecord/statics")
R comActAcidRecordStatics(@RequestParam("date")String date);
+
+ @GetMapping("/comActAcidRecord/test")
+ R test();
/**
* 分页查询所有数据
@@ -9851,4 +9879,13 @@
*/
@PostMapping("/comActAcidCheckRecord/update")
R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);
+
+ /**
+ * 单位活动统计
+ */
+ @GetMapping("/neighbor/institutionalUnitServiceAnalysis")
+ R institutionalUnitServiceAnalysis(@RequestParam(value = "year") Integer year,@RequestParam("communityId") Long communityId);
+
+ @GetMapping("/bcRegion/levelList")
+ R levelList();
}
--
Gitblit v1.7.1