bug修改

puhanshu

2022-07-23 bbda2ee1af4e86d76f93e00386d77efb56c60d5f

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

@@ -1,11 +1,16 @@
package com.panzhihua.common.service.community;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

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.dpc.AddDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.dtos.community.enterprise.*;
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;
import com.panzhihua.common.model.dtos.community.*;
@@ -20,13 +25,23 @@
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;
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;
@@ -41,9 +56,26 @@
import org.springframework.web.bind.annotation.RequestParam;

import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerAddDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerDeleteDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerEditDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO;
import com.panzhihua.common.model.dtos.common.AddComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.AddComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.AddComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto;
import com.panzhihua.common.model.dtos.common.EditComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.EditComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.EditComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
@@ -175,13 +207,58 @@
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.ApplyFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.ApprovalFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.DeleteTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.EditFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.EvaluationFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.FeedbackFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsEventAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAppletsDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.PageTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsEvaluateDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsGameDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsProductDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageJoinGameListDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsProductDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageVerifyRecordDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.PutUserInfoDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForProductDTO;
import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.*;
import com.panzhihua.common.model.dtos.community.rentingHouses.NearbyDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHousesConfigDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
@@ -194,6 +271,12 @@
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
import com.panzhihua.common.model.dtos.community.social.HatchAuditProcessDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectDTO;
import com.panzhihua.common.model.dtos.community.social.PageProjectSignListDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.social.PageSocialOrgHatchDTO;
import com.panzhihua.common.model.dtos.community.social.SocialOrgHatchAuditDTO;
import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
@@ -264,6 +347,13 @@
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
@@ -332,13 +422,26 @@
import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO;
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.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
@@ -359,7 +462,7 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-07 15:59
 **/
@FeignClient(name = "community")
@FeignClient(name = "huacheng-community")
public interface CommunityService {
    /**
     * 新增社区活动
@@ -933,7 +1036,7 @@
     * @return 类型列表
     */
    @PostMapping("listbuildtype")
    R listBuildType();
    R listBuildType(@RequestParam("communityId")Long communityId);

    /**
     * 分页查询 其他建筑
@@ -1092,10 +1195,11 @@
     *
     * @param userId
     *            用户id
     * @param status
     * @return 活动列表
     */
    @PostMapping("listactivity")
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type",required = false)Integer type);

    /**
     * 用户确认心愿
@@ -1191,7 +1295,7 @@
     * @return 社区集合 按照创建顺序倒序排列
     */
    @PostMapping("listcommunityall")
    R listCommunityAll();
    R listCommunityAll(@RequestParam("areaCode")String areaCode);

    /**
     * 首页广告banner
@@ -2198,10 +2302,11 @@
     *
     * @param provinceAdcode
     *            省份code
     * @param areaCode
     * @return 查询结果
     */
    @GetMapping("/common/data/area/all")
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode);
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);

    /**
     * 分页查询街道
@@ -2221,7 +2326,7 @@
     * @return 新增结果
     */
    @PostMapping("/addstreet")
    R<ComStreetVO> addStreet(@RequestBody ComStreetVO comStreetVOO);
    R addStreet(@RequestBody ComStreetVO comStreetVOO);

    /**
     * 删除街道
@@ -2521,6 +2626,17 @@
     */
    @PostMapping("/common/data/population/page")
    R pagePopulation(ComMngPopulationDTO comMngPopulationVO);

    /**
     * 导出老人
     *
     * @param comMngPopulationVO
     *            查询参数
     * @return 分页集合
     */
    @PostMapping("/common/data/population/exportOld")
    R exportOld(ComMngPopulationDTO comMngPopulationVO);


    /**
     * 根据身份证查询实有人口信息
@@ -3349,7 +3465,7 @@
     * @date 2021/8/31 15:03
     */
    @GetMapping("/workGuide/classify/getList")
    R getWorkGuideClassifyList();
    R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode);

    /**
     * 分页查询邻里圈
@@ -4941,12 +5057,19 @@
    /**
     * 小程序查询邻里圈话题列表
     *
     * @param communityId
     *            社区id
     * @return 邻里圈话题列表
     */
    @GetMapping("/neighbor/getNeighborTopicByApp")
    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name);
    R getNeighborTopicByApp(@RequestParam("name") String name);

    /**
     * 删除话题
     * @param id
     * @return
     */
    @GetMapping("/neighbor/deleteNeighborTopic")
    R deleteNeighborTopic(@RequestParam("id") Long id);

    /**
     * 综治后台-查询社区列表
@@ -4962,7 +5085,7 @@
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    R getWestCommunityLists();
    R getWestCommunityLists(@RequestParam("areaCode")String areaCode);

    /**
     * 综治app-小区列表
@@ -5417,7 +5540,7 @@
     * @return 社区列表
     */
    @GetMapping("/switch/community/all/list")
    R communitySwitchList();
    R communitySwitchList(@RequestParam("appId") String appId);

    /**
     * 根据名字查询所有社区列表
@@ -5427,7 +5550,7 @@
     * @return 社区列表
     */
    @GetMapping("/switch/community/search/list")
    R communitySwitchSearchList(@RequestParam(value = "name") String name);
    R communitySwitchSearchList(@RequestParam(value = "name") String name,@RequestParam(value = "appId") String appId);

    /**
     * 根据经纬度以及距离搜索附近社区列表
@@ -5525,7 +5648,7 @@
     * @return 随手拍分类列表
     */
    @GetMapping("/classify/admin/list")
    R listPhotoClassify();
    R listPhotoClassify(@RequestParam("areaCode") String areaCode);

    /**
     * 社区后台-切换随手拍公示状态
@@ -5621,7 +5744,7 @@
     * @return  预约登记详情
     */
    @GetMapping("/reserve/admin/detail")
    R detailReserveAdmin(@RequestParam("reserveId") Long reserveId);
    R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId);

    /**
     * 社区后台-根据社区id统计预约类数据
@@ -5737,6 +5860,15 @@
    R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

    /**
     * 查询预约登记题目下属选择项列表
     *
     * @param reserveSubId
     *            预约登记id
     * @return 查询预约登记题目下属选择项列表
     */
    @GetMapping("/reserve/admin/subject/selection/list")
    List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId);
    /**
     * 查询预约登记题目列表
     * @param reserveId 预约登记id
     * @return  约登记题目列表
@@ -5751,6 +5883,14 @@
     */
    @PostMapping("/reserve/admin/register/detailed/list")
    R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

    /**
     * 导出登记明细列表
     * @param detailedAdminDTO  请求参数
     * @return  登记明细列表
     */
    @PostMapping("/reserve/admin/register/detailed/list/export")
    R registerDetailedListAdminExport(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

    /**
     * 查询登记详情记录
@@ -5816,6 +5956,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
@@ -6251,7 +6415,7 @@
     * @return 菜单列表
     */
    @PostMapping("/common/data/population/second/listBack")
    public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);
    R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);

    /**
     * 微心愿处理人列表
@@ -6364,7 +6528,7 @@
     * @return
     */
    @GetMapping("/convenient/service-category/all")
    R getAllServiceCategories();
    R getAllServiceCategories(@RequestParam("areaCode") String areaCode);

    /**
     * 获取用户便民服务商家详情
@@ -6485,7 +6649,7 @@
     * @return
     */
    @GetMapping("/convenient/service-category/suitable")
    R getSuitableServiceCategories(@RequestParam("communityId") Long communityId);
    R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode);

    /**
     * 获取该社区下的热门商家
@@ -6868,6 +7032,14 @@
     */
    @PostMapping("/building/house/population/delete/admin")
    R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto);

    /**
     * 删除楼栋
     * @param id
     * @return
     */
    @GetMapping("/building/delete")
    R buildingDelete(@RequestParam("id")Long id);

    /**
     * 分页查询所有数据
@@ -7512,7 +7684,7 @@

    @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
    @Async
    void updateAllHouseUnionAppCode();
    void updateAllHouseUnionAppCode(@RequestParam("areaCode") String areaCode);

    /**
     * 西区大屏治理数据
@@ -7551,11 +7723,11 @@

    /**
     * 党员积分前3
     * @param communityId
     * @param pageBigScreenStatisticPartyOrg
     * @return
     */
    @GetMapping("/bigscreen/party/partyActivityTop")
    R partyActivityTop(@RequestParam("communityId")Long communityId);
    @PostMapping("/bigscreen/party/partyActivityTop")
    R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);

    /**
     * 社区服务大屏数据分析接口
@@ -7702,6 +7874,726 @@
    @PostMapping("/screen/index/questionnaireList")
    R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-居民活动
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/residentAct")
    R indexResidentAct(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-居民活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/residentActList")
    R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-志愿者活动
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/volunteerAct")
    R indexVolunteerAct(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-志愿者活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/volunteerActList")
    R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 清网治格-根据事件分类获取近1月的社区事件数据
     * @param type
     * @param communityId
     * @return
     */
    @GetMapping("/screen/event/list")
    R getEventList(@RequestParam(value = "type") Integer type, @RequestParam(value = "communityId") Long communityId);

    /**
     * 清网治格-社区事件数据分页
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/event/page")
    R pageEventList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 新增数字商业街商家
     * @param mcsMerchantDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/merchant/add")
    R addMcsMerchant(@RequestBody McsMerchantDTO mcsMerchantDTO);

    /**
     * 编辑数字商业街商家
     * @param mcsMerchantDTO
     * @return
     */
    @PutMapping("/microcommercialstreet/merchant/put")
    R putMcsMerchant(@RequestBody McsMerchantDTO mcsMerchantDTO);

    /**
     * 查询数字商业街商家详情
     * @param merchantId
     * @return
     */
    @GetMapping("/microcommercialstreet/merchant/get")
    R getMcsMerchant(@RequestParam("merchantId") Long merchantId);

    /**
     * 删除数字商业街商家
     * @param merchantId
     * @param userId
     * @return
     */
    @DeleteMapping("/microcommercialstreet/merchant/delete")
    R deleteMcsMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("userId") Long userId);

    /**
     * 分页查询数字商业街商家
     * @param pageMcsMerchantDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/merchant/page")
    R pageMcsMerchant(@RequestBody PageMcsMerchantDTO pageMcsMerchantDTO);

    /**
     * 禁用/启用数字商业街商家
     * @param disableOrEnableMcsMerchantDTO
     * @return
     */
    @PutMapping("/microcommercialstreet/merchant/disable-or-enable")
    R disableOrEnableMcsMerchant(@RequestBody DisableOrEnableMcsMerchantDTO disableOrEnableMcsMerchantDTO);

    /**
     * 获取所有数字商业街配置
     * @return
     */
    @GetMapping("/microcommercialstreet/config/all")
    R getAllMcsConfig();

    /**
     * 修改数字商业街配置
     * @param configs
     * @return
     */
    @PutMapping("/microcommercialstreet/config/put")
    R putMcsConfig(@RequestBody List<McsConfigVO> configs);

    /**
     * 分页查询戳戳游戏
     * @param pageMcsGameDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/game/page")
    R pageMcsGame(@RequestBody PageMcsGameDTO pageMcsGameDTO);

    /**
     * 设为/取消游戏热门
     * @param setPopularForGameDTO
     * @return
     */
    @PutMapping("/microcommercialstreet/game/setPopular")
    R setPopularForGame(@RequestBody SetPopularForGameDTO setPopularForGameDTO);

    /**
     * 上架/下架戳戳游戏
     * @param setShelfForGameDTO
     * @return
     */
    @PutMapping("/microcommercialstreet/game/setShelf")
    R setShelfForGame(@RequestBody SetShelfForGameDTO setShelfForGameDTO);

    /**
     * 删除戳戳游戏
     * @param gameId
     * @param userId
     * @return
     */
    @DeleteMapping("/microcommercialstreet/game/delete")
    R deleteMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);

    /**
     * 分页查询戳戳资讯
     * @param pageMcsInformationDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/information/page")
    R pageMcsInfo(@RequestBody PageMcsInformationDTO pageMcsInformationDTO);

    /**
     * 上架/下架戳戳资讯
     * @param setShelfForInfoDTO
     * @return
     */
    @PutMapping("/microcommercialstreet/information/setShelf")
    R setShelfForMcsInfo(@RequestBody SetShelfForInfoDTO setShelfForInfoDTO);

    /**
     * 删除戳戳资讯
     * @param infoId
     * @param userId
     * @return
     */
    @DeleteMapping("/microcommercialstreet/information/delete")
    R deleteMcsInfo(@RequestParam("infoId") Long infoId, @RequestParam("userId") Long userId);

    /**
     * 分页查询评价记录
     * @param pageMcsEvaluateDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/evaluate/page")
    R pageMcsEvaluate(@RequestBody PageMcsEvaluateDTO pageMcsEvaluateDTO);

    /**
     * 查询评价记录详情
     * @param evaluateId
     * @return
     */
    @GetMapping("/microcommercialstreet/evaluate/get")
    R getMcsEvaluate(@RequestParam("evaluateId") Long evaluateId);

    /**
     * 删除评价记录
     * @param evaluateId
     * @return
     */
    @DeleteMapping("/microcommercialstreet/evaluate/delete")
    R deleteMcsEvaluate(@RequestParam("evaluateId") Long evaluateId);

    /**
     * 新增戳戳游戏
     * @param mcsGameDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/game/add")
    R addMcsGame(@RequestBody McsGameDTO mcsGameDTO);

    /**
     * 编辑戳戳游戏
     * @param mcsGameDTO
     * @return
     */
    @PutMapping("/microcommercialstreet/game/put")
    R putMcsGame(@RequestBody McsGameDTO mcsGameDTO);

    /**
     * 发布戳戳游戏
     * @param gameId
     * @param userId
     * @return
     */
    @GetMapping("/microcommercialstreet/game/publish")
    R publishMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);

    /**
     * 结束戳戳游戏
     * @param gameId
     * @param userId
     * @return
     */
    @GetMapping("/microcommercialstreet/game/finish")
    R finishMcsGame(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);

    /**
     * 戳戳游戏/资讯顶部统计数据
     * @param type
     * @param userId
     * @return
     */
    @GetMapping("/microcommercialstreet/statistics/top")
    R getTopStatistics(@RequestParam("type") Integer type, @RequestParam("userId") Long userId);

    /**
     * 新增戳戳资讯
     * @param mcsInfoDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/information/add")
    R addMcsInfo(@RequestBody McsInfoDTO mcsInfoDTO);

    /**
     * 编辑戳戳资讯
     * @param mcsInfoDTO
     * @return
     */
    @PutMapping("/microcommercialstreet/information/put")
    R putMcsInfo(@RequestBody McsInfoDTO mcsInfoDTO);

    /**
     * 发布戳戳资讯
     * @param infoId
     * @param userId
     * @return
     */
    @GetMapping("/microcommercialstreet/information/publish")
    R publishMcsInfo(@RequestParam("infoId") Long infoId, @RequestParam("userId") Long userId);

    /**
     * 新增产品信息
     * @param mcsProductDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/product/add")
    R addMcsProduct(@RequestBody McsProductDTO mcsProductDTO);

    /**
     * 编辑产品信息
     * @param mcsProductDTO
     * @return
     */
    @PutMapping("/microcommercialstreet/product/put")
    R putMcsProduct(@RequestBody McsProductDTO mcsProductDTO);

    /**
     * 删除产品信息
     * @param deleteProductDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/product/delete")
    R deleteMcsProduct(@RequestBody DeleteProductDTO deleteProductDTO);

    /**
     * 上架/下架产品信息
     * @param setShelfForProductDTO
     * @return
     */
    @PutMapping("/microcommercialstreet/product/setShelf")
    R setShelfForMcsProduct(@RequestBody SetShelfForProductDTO setShelfForProductDTO);

    /**
     * 分页查询产品信息
     * @param pageMcsProductDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/product/page")
    R pageMcsProduct(@RequestBody PageMcsProductDTO pageMcsProductDTO);

    /**
     * 获取产品标签列表
     * @param userId
     * @return
     */
    @GetMapping("/microcommercialstreet/label/list")
    R getMcsLabelList(@RequestParam("userId") Long userId);

    /**
     * check商家/店铺是否有效
     * @param userId
     * @return
     */
    @GetMapping("/shop/checkStoreIsValid")
    R checkStoreIsValid(@RequestParam("userId") Long userId);

    /**
     * 根据account查询微商业街商家信息
     * @param account
     * @return
     */
    @GetMapping("/microcommercialstreet/getMcsMerchantByAccount")
    R getMcsMerchantByAccount(@RequestParam("account") String account);

    /**
     * 完成订单更新/新增商家信息
     * @param merchantName
     * @param configId
     * @param userId
     * @return
     */
    @GetMapping("/microcommercialstreet/updateAfterOrder")
    R updateMcsMerchantAfterOrder(@RequestParam(value = "merchantName", required = false) String merchantName,
                                  @RequestParam("configId") Long configId, @RequestParam("userId") Long userId);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/mcsOrder/queryAll")
    R selectAllMscOrder(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/mcsOrder/{id}")
    R selectOneMscOrder(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param mcsOrderVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/mcsOrder")
    R insertMscOrder(@RequestBody McsOrderVO mcsOrderVO);

    /**
     * 修改数据
     *
     * @param mcsOrderVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/mcsOrder/update")
    R updateMscOrder(@RequestBody McsOrderVO mcsOrderVO);

    /**
     * 微信支付
     * @param mcsOrderVO
     * @return
     */
    @PostMapping("/mcsOrder/wxPay")
    R wxPayMscOrder(McsOrderVO mcsOrderVO);

    /**
     * 发送提醒短信
     * @param id
     * @return
     */
    @GetMapping("/mcsOrder/sendContent")
    R sendContentMcsOrder(@RequestParam("id") Long id);

    /**
     *微信支付回调
     * @param mcsOrderVO
     * @return
     */
    @PostMapping("/mcsOrder/notify")
    R notifyMcsOrder(@RequestBody McsOrderVO mcsOrderVO);

    /**
     * 验证码登录
     * @param loginDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/loginWithPhone")
    R loginWithPhone(@RequestBody LoginWithPhoneDTO loginDTO);

    /**
     * 首页顶部数据
     * @return
     */
    @GetMapping("/microcommercialstreet/index/topData")
    R getMcsIndexTopData();

    /**
     * 戳戳卷领取
     * @param gameId
     * @param userId
     * @return
     */
    @GetMapping("/microcommercialstreet/coupon/apply")
    R applyMcsCoupon(@RequestParam("gameId") Long gameId, @RequestParam("userId") Long userId);

    /**
     * h5分页查询戳戳资讯
     * @param pageMcsInformationDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/information/pageH5")
    R pageH5McsInfo(@RequestBody PageMcsInformationDTO pageMcsInformationDTO);

    /**
     * h5分页查询戳戳游戏
     * @param pageMcsGameDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/game/pageH5")
    R pageH5McsGame(@RequestBody PageMcsGameDTO pageMcsGameDTO);

    /**
     * 游戏详情
     * @param gameId
     * @return
     */
    @GetMapping("/microcommercialstreet/game/get")
    R getMcsGame(@RequestParam("gameId") Long gameId);

    /**
     * 资讯详情
     * @param infoId
     * @return
     */
    @GetMapping("/microcommercialstreet/info/get")
    R getMcsInfo(@RequestParam("infoId") Long infoId);

    /**
     * H5分页查询数字商业街商家
     * @param pageMcsMerchantDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/merchant/pageH5")
    R pageH5McsMerchant(@RequestBody PageMcsMerchantDTO pageMcsMerchantDTO);

    /**
     * 我的戳戳卷
     * @param type
     * @param userId
     * @return
     */
    @GetMapping("/microcommercialstreet/myCoupon")
    R getMyCoupon(@RequestParam(value = "type", required = false) Integer type, @RequestParam("userId") Long userId);

    /**
     * 新增评价记录
     * @param mcsEvaluateDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/evaluate/add")
    R addMcsEvaluate(@RequestBody McsEvaluateDTO mcsEvaluateDTO);

    /**
     * 我的评价-参与游戏列表
     * @param pageJoinGameListDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/joinGame/page")
    R getJoinGameList(@RequestBody PageJoinGameListDTO pageJoinGameListDTO);

    /**
     * 戳戳卷核销
     * @param couponId
     * @param userId
     * @return
     */
    @GetMapping("/microcommercialstreet/coupon/verify")
    R verifyMcsCoupon(@RequestParam("couponId") Long couponId, @RequestParam("userId") Long userId);

    /**
     * 分页查询核销记录
     * @param pageVerifyRecordDTO
     * @return
     */
    @PostMapping("/microcommercialstreet/verifyRecord/page")
    R pageMcsVerifyRecord(@RequestBody PageVerifyRecordDTO pageVerifyRecordDTO);

    /**
     * 游戏统计
     * @param userId
     * @return
     */
    @GetMapping("/microcommercialstreet/game/statistics")
    R getMcsGameStatistics(@RequestParam("userId") Long userId);

    /**
     * 修改用戶信息
     * @param putUserInfoDTO
     * @return
     */
    @PutMapping("/microcommercialstreet/putUserInfo")
    R putUserInfo(@RequestBody PutUserInfoDTO putUserInfoDTO);

    /**
     * 根据userId获取商家信息
     * @param userId
     * @return
     */
    @GetMapping("/microcommercialstreet/retrieveMcsMerchantInfoByUserId")
    R retrieveMcsMerchantInfoByUserId(@RequestParam("userId") Long userId);

    /**
     * 定时任务-每隔5分钟执行一次，将已到期的微商业街商家旗下所有的游戏/资讯全部下架
     * @return
     */
    @GetMapping("/microcommercialstreet/offResourceForMcsMerchant")
    R offResourceForMcsMerchant();

    /**
     * 获取产品信息详情
     * @param productId
     * @return
     */
    @GetMapping("/microcommercialstreet/product/get")
    R getMcsProduct(@RequestParam("productId") Long productId);

    /**
     * 定时任务-每隔5分钟执行一次，将已到期的微商业街游戏结束
     * @return
     */
    @GetMapping("/microcommercialstreet/endStatusForMcsGame")
    R endStatusForMcsGame();

    @GetMapping("/reserve/record/delete")
    R deleteRecord(@RequestParam("recordId")Long recordId);

    /**
     * 历史数据人员类型填充
     * @param newVoList
     * @param communityId
     * @param userId
     * @return
     */
    @PostMapping("/common/data/history/filled")
    R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
                                 @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);

    /**
     * 社区后台-分页查询志愿者组织队伍
     *
     * @param orgTeamDto 请求参数
     * @return 志愿者组织队伍
     */
    @PostMapping("/comMngVolunteerOrgTeam/page")
    R pageVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto);

    /**
     * 社区后台-新增志愿者组织队伍
     *
     * @param orgTeamDto 请求参数
     * @return 新增结果
     */
    @PostMapping("/comMngVolunteerOrgTeam/add")
    R addVolunteerOrgAdmin(@RequestBody AddComMngVolunteerOrgTeamDto orgTeamDto);

    /**
     * 社区后台-编辑志愿者组织队伍
     *
     * @param orgTeamDto 请求参数
     * @return 编辑结果
     */
    @PutMapping("/comMngVolunteerOrgTeam/edit")
    R editVolunteerOrgAdmin(@RequestBody EditComMngVolunteerOrgTeamDto orgTeamDto);

    /**
     * 社区后台-删除志愿者组织队伍
     *
     * @param id 主键id
     * @return 删除结果
     */
    @GetMapping("/comMngVolunteerOrgTeam/delete")
    R deleteVolunteerOrgAdmin(@RequestParam("id") Long id);

    /**
     * 社区后台-查询志愿者组织列表
     *
     * @param orgTeamDto 请求参数
     * @return 志愿者组织列表
     */
    @PostMapping("/comMngVolunteerOrgTeam/list")
    R listVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto);

    /**
     * 社区后台-分页查询服务类型
     *
     * @param serviceTypeDto 请求参数
     * @return 服务类型列表
     */
    @PostMapping("/comMngVolunteerServiceType/page")
    R pageServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto);

    /**
     * 社区后台-新增服务类型
     *
     * @param serviceTypeDto 请求参数
     * @return 新增结果
     */
    @PostMapping("/comMngVolunteerServiceType/add")
    R addServiceTypeAdmin(@RequestBody AddComMngVolunteerServiceTypeDto serviceTypeDto);

    /**
     * 社区后台-编辑服务类型
     *
     * @param serviceTypeDto 请求参数
     * @return 编辑结果
     */
    @PutMapping("/comMngVolunteerServiceType/edit")
    R editServiceTypeAdmin(@RequestBody EditComMngVolunteerServiceTypeDto serviceTypeDto);

    /**
     * 社区后台-删除服务类型
     *
     * @param id 主键id
     * @return 删除结果
     */
    @GetMapping("/comMngVolunteerServiceType/delete")
    R deleteServiceTypeAdmin(@RequestParam("id") Long id);

    /**
     * 社区后台-分页查询志愿者技能列表
     *
     * @param volunteerSkillDto 请求参数
     * @return 志愿者技能列表
     */
    @PostMapping("/comMngVolunteerSkill/page")
    R pageVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto);

    /**
     * 社区后台-新增志愿者技能
     *
     * @param volunteerSkillDto 请求参数
     * @return 新增结果
     */
    @PostMapping("/comMngVolunteerSkill/add")
    R addVolunteerSkillAdmin(@RequestBody AddComMngVolunteerSkillDto volunteerSkillDto);

    /**
     * 社区后台-编辑志愿者技能
     *
     * @param volunteerSkillDto 请求参数
     * @return 编辑结果
     */
    @PutMapping("/comMngVolunteerSkill/edit")
    R editVolunteerSkillAdmin(@RequestBody EditComMngVolunteerSkillDto volunteerSkillDto);

    /**
     * 社区后台-删除志愿者技能
     *
     * @param id 主键id
     * @return 删除结果
     */
    @GetMapping("/comMngVolunteerSkill/delete")
    R deleteVolunteerSkillAdmin(@RequestParam("id") Long id);

    /**
     * 社区后台-查询志愿者服务类型列表
     *
     * @param serviceTypeDto 请求参数
     * @return 志愿者服务列表
     */
    @PostMapping("/comMngVolunteerServiceType/list")
    R listServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto);

    /**
     * 社区后台-查询志愿者技能列表
     *
     * @param volunteerSkillDto 请求参数
     * @return 志愿者技能列表
     */
    @PostMapping("/comMngVolunteerSkill/list")
    R listVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto);

    /**
     * 社区后台-志愿者组织统计
     *
     * @param communityId 社区id
     * @return 志愿者组织统计
     */
    @GetMapping("/comMngVolunteerOrgTeam/statistics")
    R statisticsVolunteerOrgAdmin(@RequestParam("communityId") Long communityId);

    /**
     * 志愿者导入
     *
     * @param list        志愿者数据列表
     * @param communityId 社区id
     * @param userId      用户id
     * @return 导入结果
     */
    @PostMapping("/volunteer/import/admin")
    R importVolunteerAdmin(@RequestBody List<ComMngVolunteerExcelVO> list,
                           @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

    @PostMapping("/screen/hmk/baseInfo")
    R hmkBaseInfo(@RequestBody CommonPage commonPage);

@@ -7822,7 +8714,7 @@
     * @return 查找结果
     */
    @PostMapping("/comActSocialWorker/{id}")
    R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
    R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id);

    /**
     * 批量导入社工
@@ -7926,10 +8818,11 @@
    /**
     * 小程序详情接口
     * @param id
     * @param userId
     * @return
     */
    @GetMapping("/comActSocialProject/getApplet")
    R getAppletComActSocialProject(@RequestParam("id") Long id);
    R getAppletComActSocialProject(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);

    /**
     * 分页查询所有数据
@@ -8146,4 +9039,1249 @@
     */
    @PostMapping("/comActRaffleRecord/export")
    R exportComActRaffleRecord(@RequestBody CommonPage commonPage);

    /**
     * [方法描述] 根据社区ID查询所属城市所在区区域代码，
     *
     * @param communityId
     *            社区ID
     * @return String 区域code
     * @author manailin
     * @date 2022/2/17 10:09
     */
    @GetMapping("act/getActBelongRegionCode")
    String getActBelongRegionCode(@RequestParam("communityId") Long communityId);

    /**
     * 新增团队类型
     * @param addTeamTypeDTO
     * @return
     */
    @PostMapping("/fms/teamType/add")
    R addFmsTeamType(@RequestBody AddTeamTypeDTO addTeamTypeDTO);

    /**
     * 修改团队类型
     * @param editTeamTypeDTO
     * @return
     */
    @PostMapping("/fms/teamType/edit")
    R editFmsTeamType(@RequestBody EditTeamTypeDTO editTeamTypeDTO);

    /**
     * 删除团队类型
     * @param teamTypeId
     * @param communityId
     * @return
     */
    @DeleteMapping("/fms/teamType/delete")
    R deleteFmsTeamType(@RequestParam("teamTypeId") Long teamTypeId,
                        @RequestParam("communityId") Long communityId);

    /**
     * 获取团队类型列表
     * @param communityId
     * @return
     */
    @GetMapping("/fms/teamType/list")
    R listFmsTeamType(@RequestParam("communityId") Long communityId);

    /**
     * 新增团队
     * @param addTeamDTO
     * @return
     */
    @PostMapping("/fms/team/add")
    R addFmsTeam(@RequestBody AddTeamDTO addTeamDTO);

    /**
     * 修改团队信息
     * @param editTeamDTO
     * @return
     */
    @PostMapping("/fms/team/edit")
    R editFmsTeam(@RequestBody EditTeamDTO editTeamDTO);

    /**
     * 删除团队
     * @param teamId
     * @return
     */
    @DeleteMapping("/fms/team/delete")
    R deleteFmsTeam(@RequestParam("teamId") Long teamId);

    /**
     * 获取团队列表
     * @param teamTypeId
     * @return
     */
    @GetMapping("/fms/team/list")
    R listFmsTeam(@RequestParam("teamTypeId") Long teamTypeId);

    /**
     * 获取团队详情
     * @param teamId
     * @return
     */
    @GetMapping("/fms/team/detail")
    R detailFmsTeam(@RequestParam("teamId") Long teamId);

    /**
     * 级联查询团队数据
     * @param communityId
     * @return
     */
    @GetMapping("/fms/team/cascade")
    R retrieveFmsTeamCascade(@RequestParam("communityId") Long communityId);

    /**
     * 新增团队成员
     * @param addTeamMemberDTO
     * @return
     */
    @PostMapping("/fms/teamMember/add")
    R addFmsTeamMember(@RequestBody AddTeamMemberDTO addTeamMemberDTO);

    /**
     * 编辑团队成员
     * @param editTeamMemberDTO
     * @return
     */
    @PostMapping("/fms/teamMember/edit")
    R editFmsTeamMember(@RequestBody EditTeamMemberDTO editTeamMemberDTO);

    /**
     * 删除团队成员
     * @param deleteTeamMemberDTO
     * @return
     */
    @PostMapping("/fms/teamMember/delete")
    R deleteFmsTeamMember(@RequestBody DeleteTeamMemberDTO deleteTeamMemberDTO);

    /**
     * 分页查询团队成员
     * @param pageTeamMemberDTO
     * @return
     */
    @PostMapping("/fms/teamMember/page")
    R pageFmsTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO);

    /**
     * 微团队顶部统计
     * @param communityId
     * @return
     */
    @GetMapping("/fms/teamMember/statistics")
    R statisticsFmsTeamMember(@RequestParam("communityId") Long communityId);

    /**
     * 批量导入团队成员
     * @param voList
     * @param communityId
     * @param userId
     * @return
     */
    @PostMapping("/fms/teamMember/import")
    R listSaveFmsTeamMemberExcelVO(@RequestBody List<ComFmsTeamMemberImportExcelVO> voList,
                                   @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);

    /**
     * 团队人员导出
     * @param pageTeamMemberDTO
     * @return
     */
    @PostMapping("/fms/teamMember/export")
    R exportTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO);

    /**
     * 后台新增微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/adminAdd")
    R addFmsServiceAdmin(@RequestBody AddFmsServiceAdminDTO adminDTO);

    /**
     * 后台分页查询微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/adminPage")
    R pageFmsServiceAdmin(@RequestBody PageFmsServiceAdminDTO adminDTO);

    /**
     * 后台核实微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/approval")
    R approvalFmsService(@RequestBody ApprovalFmsServiceAdminDTO adminDTO);

    /**
     * 级联查询团队服务人员
     * @param communityId
     * @return
     */
    @GetMapping("/fms/teamMember/cascade")
    R retrieveFmsTeamMemberCascade(@RequestParam("communityId") Long communityId);

    /**
     * 后台查看微服务详情
     * @param serviceId
     * @return
     */
    @GetMapping("/fms/service/detailAdmin")
    R detailFmsServiceAdmin(@RequestParam("serviceId") Long serviceId);

    /**
     * 后台删除微服务
     * @param serviceId
     * @return
     */
    @DeleteMapping("/fms/service/delete")
    R deleteFmsServiceAdmin(@RequestParam("serviceId") Long serviceId);

    /**
     * 微服务顶部统计
     * @param communityId
     * @return
     */
    @GetMapping("/fms/service/statistics")
    R statisticsFmsService(@RequestParam("communityId") Long communityId);

    /**
     * 后台导入微服务数据
     * @param voList
     * @param communityId
     * @param userId
     * @return
     */
    @PostMapping("/fms/service/import")
    R listSaveFmsServiceExcelVO(@RequestBody List<ComFmsServiceImportExcelVO> voList,
                                @RequestParam("communityId") Long communityId,
                                @RequestParam("userId") Long userId);

    /**
     * 后台新增微讲堂
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/classroom/add")
    R addFmsClassroom(@RequestBody AddFmsClassroomAdminDTO adminDTO);

    /**
     * 后台编辑微讲堂
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/classroom/edit")
    R editFmsClassroom(@RequestBody EditFmsClassroomAdminDTO adminDTO);

    /**
     * 后台删除微讲堂
     * @param id
     * @return
     */
    @DeleteMapping("/fms/classroom/delete")
    R deleteFmsClassroom(@RequestParam("id") Long id);

    /**
     * 后台获取微讲堂详情
     * @param id
     * @return
     */
    @GetMapping("/fms/classroom/detail")
    R detailFmsClassroom(@RequestParam("id") Long id);

    /**
     * 后台分页查询微讲堂
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/classroom/pageAdmin")
    R pageFmsClassroomAdmin(@RequestBody PageFmsClassroomAdminDTO adminDTO);

    /**
     * 微讲堂顶部统计
     * @param communityId
     * @return
     */
    @GetMapping("/fms/classroom/statistics")
    R statisticsFmsClassroom(@RequestParam("communityId") Long communityId);

    /**
     * 后台分页查询微调节/微防控
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/event/page")
    R pageFmsEvent(@RequestBody PageFmsEventAdminDTO adminDTO);

    /**
     * 微调节/微防控顶部统计
     * @param type
     * @param communityId
     * @return
     */
    @GetMapping("/fms/event/statistics")
    R statisticsFmsEvent(@RequestParam("type") Integer type, @RequestParam("communityId") Long communityId);

    /**
     * 微调节/微防控事件详情
     * @param eventId
     * @return
     */
    @GetMapping("/fms/event/detail")
    R detailFmsEvent(@RequestParam("eventId") Long eventId);

    /**
     * 小程序分页查询团队信息
     * @param pageFmsTeamDTO
     * @return
     */
    @PostMapping("/fms/team/pageApplets")
    R pageFmsTeamApplets(@RequestBody PageFmsTeamDTO pageFmsTeamDTO);

    /**
     * 获取微讲堂详情
     * @param id
     * @return
     */
    @GetMapping("/fms/classroom/detailApplets")
    R detailFmsClassroomApplets(@RequestParam("id") Long id);

    /**
     * 小程序分页查询微调节/微防控
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/event/pageApplets")
    R pageFmsEventApplets(@RequestBody PageFmsEventAdminDTO adminDTO);

    /**
     * 小程序分页查询微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/pageApplets")
    R pageFmsServiceApplets(@RequestBody PageFmsServiceAppletsDTO adminDTO);

    /**
     * 小程序查看微服务详情
     * @param serviceId
     * @param userId
     * @return
     */
    @GetMapping("/fms/service/detailApplets")
    R detailFmsServiceApplets(@RequestParam("serviceId") Long serviceId, @RequestParam(value = "userId", required = false) Long userId);

    /**
     * 微服务申请
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/apply")
    R applyFmsService(@RequestBody ApplyFmsServiceDTO adminDTO);

    /**
     * 分页查询我的微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/pageMy")
    R pageMyFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO);

    /**
     * 微服务评价
     * @param evaluationFmsServiceDTO
     * @return
     */
    @PostMapping("/fms/service/evaluate")
    R evaluateFmsService(@RequestBody EvaluationFmsServiceDTO evaluationFmsServiceDTO);

    /**
     * 微团队成员分页查询服务处理
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/pageDeal")
    R pageDealFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO);

    /**
     * 微团队成员服务反馈
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/feedback")
    R feedbackFmsService(@RequestBody FeedbackFmsServiceDTO adminDTO);

    /**
     * 定时任务针对服务结束后3天还未评价的用户默认好评
     * @return
     */
    @PostMapping("/fms/service/defaultPraise")
    R timedTaskFmsServiceDefaultPraise();

    @GetMapping("/activity/partyMemberCount")
    R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year);

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表
     */
    @GetMapping("/building/getBuildListByVillageId")
    R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);
    /**
     * 党员活动详情数据
     * @return
     */
    @PostMapping("/activity/partyMemberDetail")
    R partyMemberDetail(@RequestBody CommonPage commonPage);
    /**
     * 导出党员活动详情数据
     * @return
     */
    @PostMapping("/activity/exportPartyMemberDetail")
    R exportPartyMemberDetail(@RequestBody CommonPage commonPage);

    /**
     * 金沙定制页面-党建引领基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/screen/partyBuildIng/base")
    R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 党员活动展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/partyBuildIng/partyAct")
    R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 议事投票展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/partyBuildIng/discuss")
    R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员
     * @param communityId
     * @return
     */
    @GetMapping("/screen/fourMember/base")
    R getFourMemberBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 杨家坪定制页面-五微服务
     * @param communityId
     * @return
     */
    @GetMapping("/screen/fms/base")
    R getFmsBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 杨家坪定制页面-微团队展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/fms/team")
    R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 杨家坪定制页面-居家养老基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/screen/alarm/base")
    R getAlarmBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 杨家坪定制页面-报警记录展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/alarm/record")
    R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 杨家坪定制页面-报警设备点位图
     * @param communityId
     * @return
     */
    @GetMapping("/screen/alarm/pointMap")
    R getAlarmPointMap(@RequestParam("communityId") Long communityId);

    /**
     * 杨家坪定制页面-志愿服务
     * @param communityId
     * @return
     */
    @GetMapping("/screen/volunteer/base")
    R getVolunteerBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 金沙定制页面-志愿线展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/partyBuildIng/microWish")
    R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员解决问题展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/fourMember/resolve")
    R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员院落议事展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/courtyard/list")
    R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-院落议事
     * @param communityId
     * @return
     */
    @GetMapping("/screen/courtyard/base")
    R getCourtyardBaseData(@RequestParam("communityId") Long communityId);

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 分页查询返回参数
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @PostMapping("/comActEasyPhotoHandler/page")
    R queryEasyPhotoHandler(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  edit  编辑数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 编辑结果
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @PostMapping("/comActEasyPhotoHandler/edit")
    R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    @GetMapping("/reserve/fiveCount")
    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);

    /**
     * 删除数据
     *
     * @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);


    /**
     * 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);

    @GetMapping("/comActAcidRecord/test")
    R test();

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActReserveDangerArea/queryAll")
    R selectAllComActReserveDangerArea(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActReserveDangerArea/{id}")
    R selectOneComActReserveDangerArea(@PathVariable("id") Long id);

    /**
     * 修改数据
     *
     * @param comActReserveDangerAreaVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActReserveDangerArea/update")
    R updateComActReserveDangerArea(@RequestBody ComActReserveDangerAreaVO comActReserveDangerAreaVO);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActReserveDangerArea/del")
    R deleteComActReserveDangerArea(@RequestParam("id") Long id);

    /**
     * 风险区数据统计
     * @return
     */
    @GetMapping("/comActReserveDangerArea/statics")
    R staticsComActReserveDangerArea();

    /**
     * 批量设置起始时间
     * @param editDangerBatchDTO
     * @return
     */
    @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);

    @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);
    /**
     * 批量删除活动
     * @param ids
     * @return
     */
    @PostMapping("batchDel")
    R deleteActivities(@RequestBody List<Long> ids);

    /**
     * 街道详情
     * @param id
     * @return
     */
    @GetMapping("detailStreet")
    R detailStreet(@RequestParam("id") Long id);

    /**
     * 分页查询项目报名列表
     * @param pageProjectSignListDTO
     * @return
     */
    @PostMapping("/comActSocialProject/signList")
    R pageProjectSignList(@RequestBody PageProjectSignListDTO pageProjectSignListDTO);

    /**
     * 分页查询孵化申请
     * @param pageHatchAuditDTO
     * @return
     */
    @PostMapping("/comActSocialOrgHatchAudit/page")
    R pageHatchAudit(@RequestBody PageSocialOrgHatchAuditDTO pageHatchAuditDTO);

    /**
     * 查看孵化申请详情
     * @param id
     * @return
     */
    @GetMapping("/comActSocialOrgHatchAudit/detail")
    R detailHatchAudit(@RequestParam("id") Long id);

    /**
     * 修改孵化申请
     * @param hatchAuditDTO
     * @return
     */
    @PostMapping("/comActSocialOrgHatchAudit/update")
    R updateHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO);

    /**
     * 分页查询孵化数据
     * @param pageHatchDTO
     * @return
     */
    @PostMapping("/comActSocialOrgHatch/page")
    R pageOrgHatch(@RequestBody PageSocialOrgHatchDTO pageHatchDTO);

    /**
     * 查看孵化数据详情
     * @param id
     * @return
     */
    @GetMapping("/comActSocialOrgHatch/detail")
    R detailOrgHatch(@RequestParam("id") Long id);

    /**
     * 修改孵化状态
     * @param id
     * @param status
     * @return
     */
    @PutMapping("/comActSocialOrgHatch/updateStatus")
    R updateOrgHatchStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);

    /**
     * 获取孵化流程配置
     * @return
     */
    @GetMapping("/comActSocialOrgHatchAudit/process")
    R getHatchAuditProcess();

    /**
     * 修改孵化流程配置
     * @param processDTO
     * @return
     */
    @PutMapping("/comActSocialOrgHatchAudit/process")
    R putHatchAuditProcess(@RequestBody HatchAuditProcessDTO processDTO);

    /**
     * 新增孵化申请
     * @param hatchAuditDTO
     * @return
     */
    @PostMapping("/comActSocialOrgHatchAudit/add")
    R addHatchAudit(@RequestBody SocialOrgHatchAuditDTO hatchAuditDTO);

    /**
     * 查看孵化申请审核进度
     * @param userId
     * @return
     */
    @GetMapping("/comActSocialOrgHatchAudit/schedule")
    R getHatchAuditSchedule(@RequestParam("userId") Long userId);

    /**
     * 项目公开报名
     * @param projectId
     * @param userId
     * @return
     */
    @GetMapping("/comActSocialProject/sign")
    R signProject(@RequestParam("projectId") Long projectId, @RequestParam("userId") Long userId);

    /**
     * 分页查询用户报名的项目
     * @param pageProjectDTO
     * @return
     */
    @PostMapping("/comActSocialProject/project")
    R pageProjectWhichIsSignedByUser(@RequestBody PageProjectDTO pageProjectDTO);

    /**
     * 删除孵化申请详情
     * @param id
     * @return
     */
    @GetMapping("/comActSocialOrgHatchAudit/delete")
    R deleteHatchAudit(@RequestParam("id") Long id);

    /**
     * 删除孵化数据
     * @param id
     * @return
     */
    @GetMapping("/comActSocialOrgHatch/delete")
    R deleteOrgHatch(@RequestParam("id") Long id);

    /**
     * 新增社区企业
     * @param addEnterpriseDTO
     * @return
     */
    @PostMapping("/enterprise/add")
    R addEnterprise(@RequestBody AddEnterpriseDTO addEnterpriseDTO);

    /**
     * 修改社区企业
     * @param editEnterpriseDTO
     * @return
     */
    @PostMapping("/enterprise/edit")
    R editEnterprise(@RequestBody EditEnterpriseDTO editEnterpriseDTO);

    /**
     * 删除社区企业
     * @param id
     * @return
     */
    @DeleteMapping("/enterprise/delete")
    R deleteEnterprise(@RequestParam("id") Long id);

    /**
     * 获取社区企业详情
     * @param id
     * @return
     */
    @GetMapping("/enterprise/detail")
    R detailEnterprise(@RequestParam("id") Long id);

    /**
     * 分页查询社区企业
     * @param pageEnterpriseDTO
     * @return
     */
    @PostMapping("/enterprise/page")
    R pageEnterprise(@RequestBody PageEnterpriseDTO pageEnterpriseDTO);

    /**
     * 孵化中心-基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/screen/hatch/base")
    R getHatchBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 孵化中心-孵化成果展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/hatchResult/list")
    R pageHatchResult(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 孵化中心-孵化进度展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/hatchSchedule/list")
    R pageHatchSchedule(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 五社联动基础数据
     * @param communityId
     * @return
     */
    @GetMapping("/screen/fiveAssociations/base")
    R getFiveAssociationsBaseData(@RequestParam("communityId") Long communityId);

    /**
     * 五社联动项目展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/socialProject/list")
    R pageSocialProjectList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 五社联动社会组织展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/socialOrg/list")
    R pageSocialOrgList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 新增服务分类
     * @param addEnterpriseTypeDTO
     * @return
     */
    @PostMapping("/enterpriseType/add")
    R addEnterpriseType(@RequestBody AddEnterpriseTypeDTO addEnterpriseTypeDTO);

    /**
     * 修改服务分类
     * @param enterpriseTypeDTO
     * @return
     */
    @PostMapping("/enterpriseType/edit")
    R editEnterpriseType(@RequestBody EditEnterpriseTypeDTO enterpriseTypeDTO);

    /**
     * 删除服务分类
     * @param id
     * @return
     */
    @DeleteMapping("/enterpriseType/delete")
    R deleteEnterpriseType(@RequestParam("id") Long id);

    /**
     * 获取服务分类详情
     * @param id
     * @return
     */
    @GetMapping("/enterpriseType/detail")
    R detailEnterpriseType(@RequestParam("id") Long id);
    /**
     * 分页查询服务分类
     * @param pageEnterpriseTypeDTO
     * @return
     */
    @PostMapping("/enterpriseType/page")
    R pageEnterpriseType(@RequestBody PageEnterpriseTypeDTO pageEnterpriseTypeDTO);

    /**
     * 获取服务分类列表
     * @param communityId
     * @return
     */
    @GetMapping("/enterpriseType/list")
    R getEnterpriseTypeList(@RequestParam("communityId") Long communityId);

    /**
     * 新增人大代表
     * @param addDpcDTO
     * @return
     */
    @PostMapping("/dpc/add")
    R addDpc(@RequestBody AddDpcDTO addDpcDTO);

    /**
     * 修改人大代表
     * @param editDpcDTO
     * @return
     */
    @PostMapping("/dpc/edit")
    R editDpc(@RequestBody EditDpcDTO editDpcDTO);

    /**
     * 删除人大代表
     * @param id
     * @return
     */
    @DeleteMapping("/dpc/delete")
    R deleteDpc(@RequestParam("id") Long id);

    /**
     * 获取人大代表详情
     * @param id
     * @return
     */
    @GetMapping("/dpc/detail")
    R detailDpc(@RequestParam("id") Long id);

    /**
     * 分页查询人大代表
     * @param pageDpcDTO
     * @return
     */
    @PostMapping("/dpc/page")
    R pageDpc(@RequestBody PageDpcDTO pageDpcDTO);

    /**
     * 获取人大代表反馈记录
     * @param id
     * @return
     */
    @GetMapping("/dpc/feedback")
    R getFeedbackList(@RequestParam("id") Long id);

    /**
     * 人大代表反馈随手拍
     * @param comActEasyPhotoVO
     * @return
     */
    @PostMapping("/dpc/feedback")
    R addEasyPhotoFeedbackForDpc(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 人大代表
     * @param communityId
     * @return
     */
    @GetMapping("/screen/dpc/base")
    R dpcBase(@RequestParam("communityId") Long communityId);

    /**
     * 人大代表-随手拍展示列表
     * @return
     */
    @PostMapping("/screen/dpc/easyPhotoList")
    R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 查询详情
     * @param id
     * @return
     */
    @GetMapping("/comActEasyPhotoHandler/detail")
    R detailEasyPhotoHandler(@RequestParam("id") Long id);
}