From 84b51d9bfddcc8da58823fde1b322a8168db5cff Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 27 五月 2022 09:35:23 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  318 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 315 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 492d3f3..0718357 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,6 +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.*;
 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;
@@ -20,11 +21,17 @@
 import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
 import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
 import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
+import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
 import com.panzhihua.common.model.vos.*;
 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;
 import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
 import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
 import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
@@ -994,7 +1001,7 @@
      * @return 类型列表
      */
     @PostMapping("listbuildtype")
-    R listBuildType();
+    R listBuildType(@RequestParam("communityId")Long communityId);
 
     /**
      * 分页查询 其他建筑
@@ -5014,12 +5021,19 @@
     /**
      * 小程序查询邻里圈话题列表
      *
-     * @param communityId
      *            社区id
      * @return 邻里圈话题列表
      */
     @GetMapping("/neighbor/getNeighborTopicByApp")
-    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name,@RequestParam("belongType") Integer belongType);
+    R getNeighborTopicByApp(@RequestParam("name") String name);
+
+    /**
+     * 删除话题
+     * @param id
+     * @return
+     */
+    @GetMapping("/neighbor/deleteNeighborTopic")
+    R deleteNeighborTopic(@RequestParam("id") Long id);
 
     /**
      * 综治后台-查询社区列表
@@ -5906,6 +5920,26 @@
      */
     @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);
 
     /**
      * 获取系统配置value
@@ -6958,6 +6992,14 @@
      */
     @PostMapping("/building/house/population/delete/admin")
     R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto);
+
+    /**
+     * 删除楼栋
+     * @param id
+     * @return
+     */
+    @GetMapping("/building/delete")
+    R buildingDelete(@RequestParam("id")Long id);
 
     /**
      * 分页查询所有数据
@@ -9500,6 +9542,127 @@
     R fiveCount(@RequestParam("reserveId") Long reserveId);
 
     /**
+     * 删除数据
+     *
+     * @param id 主键结合
+     * @return 删除结果
+     */
+    @GetMapping("/comActEasyPhotoMember/del")
+    R comActEasyPhotoMemberDelete(@RequestParam("id") Long id);
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param commonPage 查询实体
+     * @return 所有数据
+     */
+    @PostMapping("/comActEasyPhotoMember/queryAll")
+    R comActEasyPhotoMemberSelectAll(@RequestBody CommonPage commonPage);
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("/comActEasyPhotoMember/{id}")
+    R comActEasyPhotoMemberSelectOne(@PathVariable("id") Long id);
+
+    /**
+     * 新增数据
+     *
+     * @param comActEasyPhotoMemberVO 实体对象
+     * @return 新增结果
+     */
+    @PostMapping("/comActEasyPhotoMember")
+    R comActEasyPhotoMemberInsert(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO);
+
+    /**
+     * 修改数据
+     *
+     * @param comActEasyPhotoMemberVO 实体对象
+     * @return 修改结果
+     */
+    @PostMapping("/comActEasyPhotoMember/update")
+    R comActEasyPhotoMemberUpdate(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO);
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param comActAcidRecordDTO 查询实体
+     * @return 所有数据
+     */
+    @PostMapping("/comActAcidRecord/queryAll")
+    R selectAllComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("/comActAcidRecord/{id}")
+    R selectOneComActAcidRecord(@PathVariable("id") Long id);
+
+    /**
+     * 新增数据
+     *
+     * @param comActAcidRecordVO 实体对象
+     * @return 新增结果
+     */
+    @PostMapping("/comActAcidRecord")
+    R insertComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
+
+    /**
+     * 修改数据
+     *
+     * @param comActAcidRecordVO 实体对象
+     * @return 修改结果
+     */
+    @PostMapping("/comActAcidRecord/update")
+    R updateComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
+
+
+    /**
+     * 小程序修改填报记录
+     *
+     * @param comActAcidRecordVO 实体对象
+     * @return 修改结果
+     */
+    @PostMapping("/comActAcidRecord/updateApplets")
+    R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO);
+
+    /**
+     * 删除数据
+     *
+     * @param id 主键结合
+     * @return 删除结果
+     */
+    @GetMapping("/comActAcidRecord/del")
+    R deleteComActAcidRecord(@RequestParam("id") Long id);
+
+    @PostMapping("/comActAcidRecord/export")
+    R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
+
+
+    /**
+     * 5项常规统计
+     * @return
+     */
+    @GetMapping("/comActAcidRecord/fiveCount")
+    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);
+
+    /**
      * 分页查询所有数据
      *
      * @param commonPage 查询实体
@@ -9549,4 +9712,153 @@
      */
     @PostMapping("/comActReserveDangerArea/updateBatch")
     R updateBatchComActReserveDangerArea(@RequestBody EditDangerBatchDTO editDangerBatchDTO);
+
+    @GetMapping("/comAreaTownCommunity/areaTownCommunity")
+    R areaTownCommunity(@RequestParam("name")String name,@RequestParam("userId")Long userId);
+
+    /**
+     * 物业公司详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/comProperty/detail")
+    R detailProperty(@RequestParam("id") Long id);
+
+    /**
+     * 添加物业工作人员
+     * @param propertyWorkerDTO
+     * @return
+     */
+    @PostMapping("/comPropertyWorker/add")
+    R addPropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO);
+
+    /**
+     * 编辑物业工作人员
+     * @param propertyWorkerDTO
+     * @return
+     */
+    @PutMapping("/comPropertyWorker/update")
+    R updatePropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO);
+
+    /**
+     * 删除物业工作人员
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/comPropertyWorker/delete")
+    R deletePropertyWorker(@RequestParam("id") Long id);
+
+    /**
+     * 分页查询物业工作人员
+     * @param pagePropertyWorkerDTO
+     * @return
+     */
+    @PostMapping("/comPropertyWorker/page")
+    R pagePropertyWorker(@RequestBody PagePropertyWorkerDTO pagePropertyWorkerDTO);
+
+    /**
+     * 物业工作人员详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/comPropertyWorker/detail")
+    R detailPropertyWorker(@RequestParam("id") Long id);
+
+
+    /**
+     * 分页查询所有数据
+     *
+     * @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