From ef19ae49b75d7b16cbf483b678ea4bec8f24e71c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 22 七月 2022 09:15:18 +0800
Subject: [PATCH] 五项统计bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 82 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 8821c0c..86d3ab1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -36,6 +36,8 @@
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
import com.panzhihua.common.model.vos.community.social.*;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.beans.BeanUtils;
@@ -5921,6 +5923,30 @@
@PostMapping("/neighbor/deleteNeighborByApp")
R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);
+
+ /**
+ * 分页查询邻里圈列表
+ *
+ * @param neighborCircleAppDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/selectSolve")
+ R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+
+ /**
+ * 修改数据
+ * @param editNeighborCircleAdminVO
+ * @return
+ */
+ @PostMapping("/neighbor/update")
+ R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
+
+ @PostMapping("/neighbor/serviceStatic")
+ R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);
+
+
/**
* 获取系统配置value
* @param key 系统配置code
@@ -6972,6 +6998,14 @@
*/
@PostMapping("/building/house/population/delete/admin")
R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto);
+
+ /**
+ * 删除楼栋
+ * @param id
+ * @return
+ */
+ @GetMapping("/building/delete")
+ R buildingDelete(@RequestParam("id")Long id);
/**
* 分页查询所有数据
@@ -9594,6 +9628,16 @@
@PostMapping("/comActAcidRecord/update")
R updateComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
+
+ /**
+ * 小程序修改填报记录
+ *
+ * @param comActAcidRecordVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActAcidRecord/updateApplets")
+ R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
+
/**
* 删除数据
*
@@ -9602,6 +9646,18 @@
*/
@GetMapping("/comActAcidRecord/del")
R deleteComActAcidRecord(@RequestParam("id") Long id);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActAcidRecord/detailByApp")
+ R detailByApp(@RequestParam("id") Long id,@RequestParam("localCity")String localCity);
+
+ @GetMapping("/comActAcidRecord/charts")
+ R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity);
@PostMapping("/comActAcidRecord/export")
R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
@@ -9619,10 +9675,13 @@
* @return
*/
@GetMapping("/comActAcidRecord/fiveCountPlus")
- R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity);
+ R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity,@RequestParam(value = "loginAccount",required = false)String loginAccount);
@GetMapping("/comActAcidRecord/statics")
R comActAcidRecordStatics(@RequestParam("date")String date);
+
+ @GetMapping("/comActAcidRecord/test")
+ R test();
/**
* 分页查询所有数据
@@ -9676,7 +9735,7 @@
R updateBatchComActReserveDangerArea(@RequestBody EditDangerBatchDTO editDangerBatchDTO);
@GetMapping("/comAreaTownCommunity/areaTownCommunity")
- R areaTownCommunity(@RequestParam("name")String name);
+ R areaTownCommunity(@RequestParam("name")String name,@RequestParam("userId")Long userId);
/**
* 物业公司详情
@@ -9823,4 +9882,23 @@
*/
@PostMapping("/comActAcidCheckRecord/update")
R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);
+
+ @GetMapping("/bcRegion/levelList")
+ R levelList(@RequestParam("level")Integer level,@RequestParam("code")String code);
+
+ @GetMapping("/bcRegion/levelListBackstage")
+ R levelListBackstage();
+
+ /**
+ * 单位活动统计
+ */
+ @GetMapping("/neighbor/activityAnalysis")
+ R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
+ @RequestParam(value = "page",required = false) Integer page,
+ @RequestParam(value = "size",required = false) Integer size,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "unitId",required = false) Long unitId,
+ @RequestParam(value = "loginAccount",required = false) String loginAccount);
+
}
--
Gitblit v1.7.1