From 6307ae8f285d251c650b5491a74599963f807cb2 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 四月 2022 14:42:45 +0800
Subject: [PATCH] Merge branch 'huacheng_paicha' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_paicha

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 112 insertions(+), 3 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 1ebad4b..30562cd 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
@@ -5,7 +5,7 @@
 import com.panzhihua.common.model.dtos.PageBaseDTO;
 import com.panzhihua.common.model.dtos.civil.*;
 import com.panzhihua.common.model.dtos.common.*;
-import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
+import com.panzhihua.common.model.dtos.community.acid.*;
 import com.panzhihua.common.model.dtos.community.reserve.*;
 import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
 import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
@@ -25,6 +25,8 @@
 import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
 import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
 import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
 import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
 import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
 import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO;
@@ -997,7 +999,7 @@
      * @return 类型列表
      */
     @PostMapping("listbuildtype")
-    R listBuildType();
+    R listBuildType(@RequestParam("communityId")Long communityId);
 
     /**
      * 分页查询 其他建筑
@@ -9601,8 +9603,17 @@
      * @return
      */
     @GetMapping("/comActAcidRecord/fiveCount")
-    R comActAcidRecordFiveCount();
+    R comActAcidRecordFiveCount(@RequestParam("localCity")String localCity);
 
+    /**
+     * 7项常规统计
+     * @return
+     */
+    @GetMapping("/comActAcidRecord/fiveCountPlus")
+    R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity);
+
+    @GetMapping("/comActAcidRecord/statics")
+    R comActAcidRecordStatics(@RequestParam("date")String date);
 
     /**
      * 分页查询所有数据
@@ -9657,4 +9668,102 @@
 
     @GetMapping("/comAreaTownCommunity/areaTownCommunity")
     R areaTownCommunity(@RequestParam("name")String name);
+
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param commonPage 查询实体
+     * @return 所有数据
+     */
+    @PostMapping("/comActAcidMember/queryAll")
+    R selectAllComActAcidMember(@RequestBody ComActAcidMemberDTO commonPage);
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("/comActAcidMember/{id}")
+    R selectOneComActAcidMember(@PathVariable("id") Long id);
+
+    /**
+     * 新增数据
+     *
+     * @param comActAcidMemberVO 实体对象
+     * @return 新增结果
+     */
+    @PostMapping("/comActAcidMember")
+    R insertComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO);
+
+    /**
+     * 修改数据
+     *
+     * @param comActAcidMemberVO 实体对象
+     * @return 修改结果
+     */
+    @PostMapping("/comActAcidMember/update")
+    R updateComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO);
+
+    /**
+     * 删除数据
+     *
+     * @param id 主键结合
+     * @return 删除结果
+     */
+    @GetMapping("/comActAcidMember/del")
+    R deleteComActAcidMember(@RequestParam("id") Long id);
+
+    /**
+     * 分页查询风险人员
+     * @param pageDangerMemberDTO
+     * @return
+     */
+    @PostMapping("/comActAcidDangerMember/page")
+    R pageDangerMember(@RequestBody PageDangerMemberDTO pageDangerMemberDTO);
+
+    /**
+     * 后台分页查询风险人员
+     * @param pageDangerMemberDTO
+     * @return
+     */
+    @PostMapping("/comActAcidDangerMember/queryAll")
+    R pageDangerMemberAdmin(@RequestBody ComActAcidDangerMemberDTO pageDangerMemberDTO);
+
+    /**
+     * 列表查询
+     *
+     * @param comActAcidCheckRecordDTO 查询实体
+     * @return 所有数据
+     */
+    @PostMapping("/comActAcidCheckRecord/queryAll")
+    R selectAllComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO);
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("/comActAcidCheckRecord/{id}")
+    R selectOneComActAcidCheckRecord(@PathVariable("id") Long id);
+
+    /**
+     * 新增数据
+     *
+     * @param comActAcidCheckRecordVO 实体对象
+     * @return 新增结果
+     */
+    @PostMapping("/comActAcidCheckRecord")
+    R insertComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);
+
+    /**
+     * 修改数据
+     *
+     * @param comActAcidCheckRecordVO 实体对象
+     * @return 修改结果
+     */
+    @PostMapping("/comActAcidCheckRecord/update")
+    R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);
 }

--
Gitblit v1.7.1