From 06180fa3c8ee17d731561b88897fa18b9f8cf228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 04 十一月 2022 17:53:50 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into local_20221104
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java | 19 ++++++++++++++++++-
1 files changed, 18 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 463d2b0..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;
@@ -103,6 +104,16 @@
}
/**
+ * 批量核对防疫信息数据
+ * @param batchCheckAcidRecordDTO
+ * @return
+ */
+ @PostMapping("/batchCheck")
+ public R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO) {
+ return this.comActAcidRecordService.batchCheck(batchCheckAcidRecordDTO);
+ }
+
+ /**
* 小程序修改填报记录
*
* @param comActAcidRecordVO 实体对象
@@ -139,7 +150,7 @@
* @return
*/
@GetMapping("fiveCountPlus")
- public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity,@RequestParam("loginAccount")String loginAccount){
+ 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);
}
@@ -165,4 +176,10 @@
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