From 09e24f2b5bcae65f69de695dd30949bc6b76a709 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 18 五月 2022 14:04:26 +0800
Subject: [PATCH] 花城E+bug更新
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 b2a4e22..8bd05c8 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
@@ -8,6 +8,7 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.ComActAcidRecord;
import com.panzhihua.service_community.service.ComActAcidRecordService;
import org.springframework.beans.BeanUtils;
@@ -15,6 +16,7 @@
import javax.annotation.Resource;
import java.io.Serializable;
+import java.util.Date;
import java.util.List;
/**
@@ -57,6 +59,17 @@
}
/**
+ * 分页查询所有数据
+ *
+ * @param comActAcidRecordDTO 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("exportNew")
+ public R exportNew(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
+ return this.comActAcidRecordService.exportNew(comActAcidRecordDTO);
+ }
+
+ /**
* 通过主键查询单条数据
*
* @param id 主键
@@ -86,9 +99,7 @@
*/
@PostMapping("/update")
public R update(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
- ComActAcidRecord comActAcidRecord=new ComActAcidRecord();
- BeanUtils.copyProperties(comActAcidRecordVO,comActAcidRecord);
- return R.ok(this.comActAcidRecordService.updateById(comActAcidRecord));
+ return this.comActAcidRecordService.updateLocalCity(comActAcidRecordVO);
}
/**
@@ -99,7 +110,7 @@
*/
@GetMapping("del")
public R delete(@RequestParam("id") Long id) {
- return R.ok(this.comActAcidRecordService.removeById(id));
+ return this.comActAcidRecordService.delete(id);
}
/**
@@ -110,4 +121,18 @@
public R fiveCount(@RequestParam("localCity")String localCity){
return this.comActAcidRecordService.fiveCount(localCity);
}
+
+ /**
+ * 7项常规统计
+ * @return
+ */
+ @GetMapping("fiveCountPlus")
+ public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity){
+ return this.comActAcidRecordService.fiveCountPlus(date,localCity);
+ }
+
+ @GetMapping("/statics")
+ public R statics(@RequestParam("date")String date){
+ return this.comActAcidRecordService.statics(date);
+ }
}
--
Gitblit v1.7.1