From c640b18fae716de628b2a2b4d43f6869f3ab83ff Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 08 七月 2022 13:23:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java
index 8bd05c8..cf025fe 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java
@@ -77,7 +77,7 @@
*/
@GetMapping("{id}")
public R selectOne(@PathVariable("id") Long id) {
- return R.ok(this.comActAcidRecordService.getById(id));
+ return this.comActAcidRecordService.detailByCommunity(id);
}
/**
@@ -101,6 +101,18 @@
public R update(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
return this.comActAcidRecordService.updateLocalCity(comActAcidRecordVO);
}
+
+ /**
+ * 小程序修改填报记录
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/updateApplets")
+ public R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
+ return this.comActAcidRecordService.updateApplets(comActAcidRecordVO);
+ }
+
/**
* 删除数据
@@ -131,8 +143,26 @@
return this.comActAcidRecordService.fiveCountPlus(date,localCity);
}
+ /**
+ * 图标统计
+ * @return
+ */
+ @GetMapping("charts")
+ public R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity){
+ return this.comActAcidRecordService.charts(date,localCity);
+ }
+
@GetMapping("/statics")
public R statics(@RequestParam("date")String date){
return this.comActAcidRecordService.statics(date);
}
+
+ @GetMapping("/detailByApp")
+ public R detailByApp(@RequestParam("id")Long id,@RequestParam("localCity")String localCity){
+ return this.comActAcidRecordService.detailByApp(id,localCity);
+ }
+ @GetMapping("/test")
+ public R test(){
+ return this.comActAcidRecordService.test();
+ }
}
--
Gitblit v1.7.1