From 04f24e0bbeeb6caa9754af0b6bab66a233570362 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 14:45:30 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java
index b724bbd..b580850 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java
@@ -4,6 +4,7 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidCharts;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordTimeVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.reserve.FiveCount;
@@ -46,9 +47,6 @@
@ApiOperation(value = "分页查询",response = ComActAcidRecordVO.class)
@PostMapping("queryAll")
public R selectAll(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
- if(StringUtils.isNotEmpty(this.getLoginUserInfo().getRelationName())){
- comActAcidRecordDTO.setLocalCity(this.getLoginUserInfo().getRelationName());
- }
return this.communityService.selectAllComActAcidRecord(comActAcidRecordDTO);
}
@@ -89,9 +87,22 @@
@ApiOperation(value = "修改数据")
@PostMapping("/update")
public R update(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
+ comActAcidRecordVO.setUserId(this.getUserId());
return this.communityService.updateComActAcidRecord(comActAcidRecordVO);
}
+ /**
+ * 修改数据
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/updateApplets")
+ public R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
+ comActAcidRecordVO.setUserId(this.getUserId());
+ return this.communityService.updateApplets(comActAcidRecordVO);
+ }
/**
* 删除数据
*
@@ -111,6 +122,25 @@
@ApiOperation(value = "7项常规统计",response = FiveCount.class)
@GetMapping("fiveCountPlus")
public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity") String localCity){
- return this.communityService.comActAcidRecordFiveCountPlus(date,localCity);
+ return this.communityService.comActAcidRecordFiveCountPlus(date,localCity,null);
+ }
+ @ApiOperation(value = "新版查看详情",response = ComActAcidRecordVO.class)
+ @GetMapping("/detailByApp")
+ public R detailByApp(@RequestParam("id")Long id,@RequestParam("localCity")String localCity){
+ return this.communityService.detailByApp(id,localCity);
+ }
+
+ /**
+ * 图标统计
+ * @return
+ */
+ @ApiOperation(value = "图标统计",response = ComActAcidCharts.class)
+ @GetMapping("charts")
+ public R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity){
+ return this.communityService.charts(date,localCity);
+ }
+ @GetMapping("/checkCommit")
+ public R checkCommit(){
+ return this.communityService.checkCommit(this.getUserId());
}
}
--
Gitblit v1.7.1