From a4aa79a8fd9a40b34bac8ebb153f7ab1977282d3 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 09 四月 2021 15:45:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 127 +++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 26 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 453e622..5567c69 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
@@ -7,6 +7,8 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
+import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -346,7 +348,7 @@
* @param comMngRealCompanyBelongsDTO
* @return
*/
- @GetMapping("/common/data/company/belongs")
+ @PostMapping("/common/data/company/belongs")
R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);
@@ -1482,8 +1484,8 @@
/**
* 查询省下所有区域 tree结构
*
- * @param provinceAdcode
- * @return
+ * @param provinceAdcode 省份code
+ * @return 查询结果
*/
@GetMapping("/common/data/area/all")
R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode);
@@ -1491,8 +1493,8 @@
/**
* 分页查询街道
*
- * @param pageComStreetDTO
- * @return
+ * @param pageComStreetDTO 查询条件
+ * @return 查询结果
*/
@PostMapping("/pagestreet")
R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO);
@@ -1500,17 +1502,17 @@
/**
* 新增街道
*
- * @param comStreetVOO
- * @return
+ * @param comStreetVOO 需要新增的街道数据
+ * @return 新增结果
*/
@PostMapping("/addstreet")
- R pageStreet(@RequestBody ComStreetVO comStreetVOO);
+ R addStreet(@RequestBody ComStreetVO comStreetVOO);
/**
* 删除街道
*
- * @param Ids
- * @return
+ * @param Ids 需要删除街道id集合
+ * @return 删除结果
*/
@PostMapping("/deletestreet")
R delectStreat(@RequestBody List<Long> Ids);
@@ -1518,8 +1520,8 @@
/**
* 查询街道
*
- * @param comStreetVO
- * @return
+ * @param comStreetVO 查询条件
+ * @return 返回结果
*/
@PostMapping("/liststreet")
R listStreet(ComStreetVO comStreetVO);
@@ -1527,8 +1529,8 @@
/**
* 分页查询实有房屋
*
- * @param pageComMngVillageDTO
- * @return
+ * @param pageComMngVillageDTO 查询条件
+ * @return 返回结果
*/
@PostMapping("/pagevillage")
R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO);
@@ -1536,8 +1538,8 @@
/**
* 新增实有房屋
*
- * @param comMngVillageVO
- * @return
+ * @param comMngVillageVO 新增的实有房屋数据
+ * @return 新增结果
*/
@PostMapping("/addvillage")
R addVillage(@RequestBody ComMngVillageVO comMngVillageVO);
@@ -1545,8 +1547,8 @@
/**
* 删除实有房屋
*
- * @param Ids
- * @return
+ * @param Ids 需要删除的id集合
+ * @return 删除结果
*/
@PostMapping("/deletevillage")
R delectVillage(@RequestBody List<Long> Ids);
@@ -1554,8 +1556,8 @@
/**
* 查询实有房屋
*
- * @param comMngVillageVO
- * @return
+ * @param comMngVillageVO 查询条件
+ * @return 查询结果
*/
@PostMapping("/listvillage")
R listVillage(ComMngVillageVO comMngVillageVO);
@@ -1563,9 +1565,9 @@
/**
* 批量导入实有房屋
*
- * @param list
- * @param communityId
- * @return
+ * @param list 实有房屋数据
+ * @param communityId 社区id
+ * @return 导入结果
*/
@PostMapping("/village/import")
R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
@@ -1574,9 +1576,9 @@
/**
* 批量导入实有人口
*
- * @param list
- * @param communityId
- * @return
+ * @param list 实有人口数据
+ * @param communityId 社区id
+ * @return 导入结果
*/
@PostMapping("/common/data/population/import")
R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
@@ -1608,4 +1610,77 @@
@PostMapping("/common/data/population/editTag")
R editTagPopulation(ComMngPopulationTagDTO populationTagDTO);
+ /**
+ * 批量删除实有人口
+ *
+ * @param Ids 实有人口id集合
+ * @return 删除结果
+ */
+ @PostMapping("/common/data/population/delete")
+ R deletePopulations(@RequestBody List<Long> Ids);
+
+ /**
+ * 根据社区id查询所有实有人口
+ *
+ * @param communityId 社区id
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getAll")
+ R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 根据id集合查询实有人口
+ *
+ * @param Ids 实有人口id集合
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getList")
+ R getPopulationLists(@RequestBody List<Long> Ids);
+
+ /**
+ * 新增社区问卷
+ *
+ * @param questnaireVO
+ * @return
+ */
+ @PostMapping("/questnaire/addquestnaire")
+ R addQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+
+ /**
+ * 新增社区问卷
+ *
+ * @param questnaireVO
+ * @return
+ */
+ @PostMapping("/questnaire/pagequestnaire")
+ R pageQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+
+
+ /**
+ * 编辑问卷——问卷、题目、选项
+ *
+ * @param questnaireVO
+ * @return
+ */
+ @PostMapping("/questnaire/editquestnaire")
+ R editQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+
+
+ /**
+ * 修改问卷状态
+ *
+ * @param editComActQuestnaireVo
+ * @return
+ */
+ @PostMapping("/questnaire/editquestnairedo")
+ R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo);
+
+ /**
+ * 删除问卷 ——隐藏
+ *
+ * @param questId 调查问卷Id
+ * @return
+ */
+ @PostMapping("/questnaire/deletequestnaire")
+ R editQuestnaireDO(@RequestParam("questId") Long questId);
}
--
Gitblit v1.7.1