From 7fc1daa8a0de3395ad4486d598ee1993fa0ac68d Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 23 十一月 2022 10:56:59 +0800
Subject: [PATCH] 三说会堂修改社区范围，筛选
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 10 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 2e67981..7d7b787 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.dtos.community.acid.BatchCheckAcidRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -59,6 +60,17 @@
}
/**
+ * 分页查询所有数据
+ *
+ * @param comActAcidRecordDTO 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("exportNew")
+ public R exportNew(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO) {
+ return this.comActAcidRecordService.exportNew(comActAcidRecordDTO);
+ }
+
+ /**
* 通过主键查询单条数据
*
* @param id 主键
@@ -66,7 +78,7 @@
*/
@GetMapping("{id}")
public R selectOne(@PathVariable("id") Long id) {
- return R.ok(this.comActAcidRecordService.getById(id));
+ return this.comActAcidRecordService.detailByCommunity(id);
}
/**
@@ -88,13 +100,30 @@
*/
@PostMapping("/update")
public R update(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
- ComActAcidRecord comActAcidRecord=new ComActAcidRecord();
- BeanUtils.copyProperties(comActAcidRecordVO,comActAcidRecord);
- if(StringUtils.isNotEmpty(comActAcidRecord.getLocalCity())){
- this.comActAcidRecordService.updateById(comActAcidRecord);
- }
- return R.ok();
+ return this.comActAcidRecordService.updateLocalCity(comActAcidRecordVO);
}
+
+ /**
+ * 批量核对防疫信息数据
+ * @param batchCheckAcidRecordDTO
+ * @return
+ */
+ @PostMapping("/batchCheck")
+ public R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO) {
+ return this.comActAcidRecordService.batchCheck(batchCheckAcidRecordDTO);
+ }
+
+ /**
+ * 小程序修改填报记录
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/updateApplets")
+ public R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
+ return this.comActAcidRecordService.updateApplets(comActAcidRecordVO);
+ }
+
/**
* 删除数据
@@ -104,7 +133,7 @@
*/
@GetMapping("del")
public R delete(@RequestParam("id") Long id) {
- return R.ok(this.comActAcidRecordService.removeById(id));
+ return this.comActAcidRecordService.delete(id);
}
/**
@@ -121,12 +150,36 @@
* @return
*/
@GetMapping("fiveCountPlus")
- public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity){
- return this.comActAcidRecordService.fiveCountPlus(date,localCity);
+ public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity,@RequestParam(value = "loginAccount",required = false)String loginAccount){
+ return this.comActAcidRecordService.fiveCountPlus(date,localCity,loginAccount);
+ }
+
+ /**
+ * 图标统计
+ * @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();
+ }
+
+
+ @GetMapping("/checkCommit")
+ public R checkCommit(@RequestParam(value = "userId",required = false)Long userId){
+ return this.comActAcidRecordService.checkCommit(userId);
+ }
}
--
Gitblit v1.7.1