From 5aec730a4be904b0bc8225a80bdfcfebb1346a74 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 12 五月 2022 10:26:21 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 30e56ad..b724bbd 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,11 +4,15 @@
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.ComActAcidRecordTimeVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
+import com.panzhihua.common.model.vos.community.reserve.FiveCount;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -42,6 +46,9 @@
@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);
}
@@ -60,12 +67,14 @@
/**
* 新增数据
*
- * @param comActAcidRecordVO 实体对象
+ * @param comActAcidRecord 实体对象
* @return 新增结果
*/
@ApiOperation(value = "新增数据")
@PostMapping
- public R insert(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
+ public R insert(@RequestBody ComActAcidRecordTimeVO comActAcidRecord) {
+ ComActAcidRecordVO comActAcidRecordVO=new ComActAcidRecordVO();
+ BeanUtils.copyProperties(comActAcidRecord,comActAcidRecordVO);
comActAcidRecordVO.setUserId(this.getUserId());
comActAcidRecordVO.setCreateTime(new Date());
return this.communityService.insertComActAcidRecord(comActAcidRecordVO);
@@ -94,4 +103,14 @@
public R delete(@RequestParam("id") Long id) {
return this.communityService.deleteComActAcidRecord(id);
}
+
+ /**
+ * 5项常规统计
+ * @return
+ */
+ @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);
+ }
}
--
Gitblit v1.7.1