Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-13 e74987c5c7e6256e84a0852f36a367bf8f2e032d

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -7,6 +7,9 @@
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.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -129,6 +132,15 @@
     */
    @PostMapping("pagedynamic")
    R pageDynamic(@RequestBody ComActDynVO comActDynVO);

    /**
     * 管理后台分页查询社区动态
     *
     * @param comActDynVO 查询参数
     * @return 动态集合
     */
    @PostMapping("pagedynamicByAdmin")
    R pageDynamicByAdmin(@RequestBody ComActDynVO comActDynVO);

    /**
     * 社区动态详情
@@ -346,7 +358,7 @@
     * @param comMngRealCompanyBelongsDTO
     * @return
     */
    @GetMapping("/common/data/company/belongs")
    @PostMapping("/common/data/company/belongs")
    R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);


@@ -1482,8 +1494,8 @@
    /**
     * 查询省下所有区域  tree结构
     *
     * @param provinceAdcode
     * @return
     * @param provinceAdcode 省份code
     * @return 查询结果
     */
    @GetMapping("/common/data/area/all")
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode);
@@ -1491,8 +1503,8 @@
    /**
     * 分页查询街道
     *
     * @param pageComStreetDTO
     * @return
     * @param pageComStreetDTO 查询条件
     * @return 查询结果
     */
    @PostMapping("/pagestreet")
    R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO);
@@ -1500,17 +1512,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 +1530,8 @@
    /**
     * 查询街道
     *
     * @param comStreetVO
     * @return
     * @param comStreetVO 查询条件
     * @return 返回结果
     */
    @PostMapping("/liststreet")
    R listStreet(ComStreetVO comStreetVO);
@@ -1527,8 +1539,8 @@
    /**
     * 分页查询实有房屋
     *
     * @param pageComMngVillageDTO
     * @return
     * @param pageComMngVillageDTO 查询条件
     * @return 返回结果
     */
    @PostMapping("/pagevillage")
    R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO);
@@ -1536,8 +1548,8 @@
    /**
     * 新增实有房屋
     *
     * @param comMngVillageVO
     * @return
     * @param comMngVillageVO 新增的实有房屋数据
     * @return 新增结果
     */
    @PostMapping("/addvillage")
    R addVillage(@RequestBody ComMngVillageVO comMngVillageVO);
@@ -1545,8 +1557,8 @@
    /**
     * 删除实有房屋
     *
     * @param Ids
     * @return
     * @param Ids 需要删除的id集合
     * @return 删除结果
     */
    @PostMapping("/deletevillage")
    R delectVillage(@RequestBody List<Long> Ids);
@@ -1554,8 +1566,8 @@
    /**
     * 查询实有房屋
     *
     * @param comMngVillageVO
     * @return
     * @param comMngVillageVO 查询条件
     * @return 查询结果
     */
    @PostMapping("/listvillage")
    R listVillage(ComMngVillageVO comMngVillageVO);
@@ -1563,9 +1575,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);
@@ -1573,15 +1585,17 @@

    /**
     * 批量导入实有人口
     * @param list
     * @param communityId
     * @return
     *
     * @param list        实有人口数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/population/import")
    R listSavePopulationServeExcelVO(List<ComMngPopulationServeExcelVO> list,@RequestParam(value = "communityId")  Long communityId);
    @PostMapping("/common/data/population/import")
    R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 分页查询实有人口
     *
     * @param comMngPopulationVO 查询参数
     * @return 分页集合
     */
@@ -1590,6 +1604,7 @@

    /**
     * 根据id实有人口详细信息
     *
     * @param populationId 实有人口id
     * @return 实有人口详细信息
     */
@@ -1598,9 +1613,145 @@

    /**
     * 根据id修改实有人口标签列表
     *
     * @param populationTagDTO 请求参数
     * @return 修改结果
     */
    @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, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);

    /**
     * 社区问卷列表
     *
     * @param pageQuestnaireDTO
     * @return
     */
    @PostMapping("/questnaire/pagequestnaire")
    R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO, @RequestParam("communityId") Long communityId);


    /**
     * 编辑问卷——问卷、题目、选项
     *
     * @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,@RequestParam("userId") Long userId);

    /**
     * 问卷答题结果
     *
     * @param questId 问卷ID
     */
    @PostMapping("/questnaire/answerslist")
    R answerResultList(@RequestParam("questId") Long questId);


    /**
     * 问卷调查详细
     * @param questId 问卷ID
     * @return 用户问卷调查详细
     */
    @GetMapping("/questnaire/view")
    R view(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);

    /**
     * 用户问卷调查详细
     * @param userId 用户ID
     * @param questId 问卷ID
     * @return 用户问卷调查详细
     */
    @GetMapping("/questnaire/usersanswer")
    R answerInfoQuestnaire(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);

    /**
     * 查看用户问卷调查统计信息
     * @param questId 问卷ID
     * @return 用户问卷调查统计信息
     */
    @GetMapping("/questnaire/stat")
    R statistics(@RequestParam("questId") Long questId);


    /**
     * 问卷题目 答卷信息
     *
     * @param pageQuestnaireSubDetailsDTO 问卷ID
     */
    @PostMapping("/questnaire/qaqeustanswerdetails")
    R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);


    /**
     * 社区问卷分页
     * @param pageQuestnaireAnswerDTO 社区问卷分页参数
     * @return 分页数据
     */
    @PostMapping("/questnaire/pagequestnaireanswer")
    R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);


    /**
     * 居民填写问卷调查问卷
     * @param usersAnswerQuestnaireVO 填写情况
     */
    @PostMapping("/questnaire/usersanswequestnaire")
    R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, @RequestParam("userId") Long userId);

}