三社功能修改

101captain

2022-03-02 ccff69c44c520fb70ce7e1316a7de8cecaadafd3

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

@@ -1,7 +1,11 @@
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.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.*;
@@ -16,11 +20,18 @@
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.vos.*;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
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.social.*;
import io.swagger.annotations.ApiOperation;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.beans.BeanUtils;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -59,6 +70,7 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
@@ -100,6 +112,7 @@
import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
@@ -120,6 +133,13 @@
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingHouseDto;
import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingUnitDto;
import com.panzhihua.common.model.dtos.community.building.admin.DeleteBuildingHousePopulationDto;
import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingHouseDto;
import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingUnitDto;
import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingListDto;
import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingUnitHouseListDto;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterMemberAdminDto;
@@ -161,6 +181,7 @@
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.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.dtos.community.rentingHouses.*;
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;
@@ -179,6 +200,7 @@
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
@@ -242,16 +264,14 @@
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.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
@@ -303,6 +323,7 @@
import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
@@ -314,6 +335,10 @@
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.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.warehouse.ComActWarehouseApplyVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
@@ -1070,7 +1095,7 @@
     * @return 活动列表
     */
    @PostMapping("listactivity")
    R listActivity(@RequestParam("userId") Long userId);
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type",required = false)Integer type);

    /**
     * 用户确认心愿
@@ -2196,7 +2221,7 @@
     * @return 新增结果
     */
    @PostMapping("/addstreet")
    R addStreet(@RequestBody ComStreetVO comStreetVOO);
    R<ComStreetVO> addStreet(@RequestBody ComStreetVO comStreetVOO);

    /**
     * 删除街道
@@ -5300,11 +5325,11 @@
    R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);

    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 根据社区活动id查询社区活动报名且未参与人员列表
     *
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
     * @return 社区活动报名且未参与人员列表
     */
    @PostMapping("/integral/act/activity/admin")
    R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
@@ -5355,7 +5380,7 @@
     * @return 查询结果
     */
    @GetMapping("/patrolRecord/rota/getRotaPersonByDate")
    R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate);
    R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);

    /**
     * 根据日期查询值班领导
@@ -5363,7 +5388,7 @@
     * @return 查询结果
     */
    @GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);

    /**
     * 批量导入值班表
@@ -5528,6 +5553,8 @@
    @PostMapping("/reserve/commit")
    R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO);

    @PostMapping("/reserve/commitNoToken")
    R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
    /**
     * 我的预约/登记
     * @param pageUserReserveDTO
@@ -7200,4 +7227,926 @@
     */
    @PostMapping("/reserve/admin/register/homeQuarantine/page")
    R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

    /**
     * 居家隔离导出
     * @param pageReserveRegisterDetailedAdminDTO
     * @return
     */
    @PostMapping("/reserve/admin/homeQuarantine/export")
    R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

    /**
     * 分页查询物业宣传
     * @param pageComPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/page")
    R pageComPropertyPublicity(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);

    /**
     * 新增物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/add")
    R addComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);

    /**
     * 修改物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/update")
    R updateComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);

    /**
     * 查看物业宣传信息
     * @param id
     * @return
     */
    @GetMapping("/property/publicity/get")
    R getComPropertyPublicity(@RequestParam("id") Long id);

    /**
     * 删除物业宣传
     * @param id
     * @return
     */
    @DeleteMapping("/property/publicity/delete")
    R deleteComPropertyPublicity(@RequestParam("id") Long id);

    /**
     * 物业公司列表
     *
     * @param villageId
     * @param communityId
     * @return
     */
    @GetMapping("/property/publicity/list/property")
    R listProperty(@RequestParam(value = "villageId", required = false) Long villageId, @RequestParam("communityId") Long communityId);

    /**
     * 分页查询物业宣传-小程序
     * @param pageComPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/page/applet")
    R pageComPropertyPublicityApplet(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);

    /**
     * 增加物业宣传浏览量
     * @param id
     * @return
     */
    @GetMapping("/property/publicity/incr-view")
    R incrPropertyPublicityView(@RequestParam("id") Long id);

    /**
     * 获取预设图片
     * @param type
     * @param subtype
     * @return
     */
    @GetMapping("/picture/library/get")
    R getPresetPictureLibrary(@RequestParam("type") Integer type, @RequestParam("subtype") Integer subtype);

    /**
     * 分页查询房屋租赁基础配置
     * @param pageRentingHousesConfigDTO
     * @return
     */
    @PostMapping("/rentingHousesConfig/page")
    R pageRentingHousesConfig(@RequestBody PageRentingHousesConfigDTO pageRentingHousesConfigDTO);

    /**
     * 更新配置信息
     * @param rentingHousesConfigDTO
     * @return
     */
    @PutMapping("/rentingHousesConfig/update")
    R updateRentingHousesConfig(@RequestBody RentingHousesConfigDTO rentingHousesConfigDTO);

    /**
     * 新增房源信息
     * @param registerDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/register")
    R registerRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);

    /**
     * 编辑房源信息
     * @param registerDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/update")
    R updateRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);

    /**
     * 分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/page")
    R pageRentingHouse(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);

    /**
     * 发布/取消发布 房源信
     * @param releaseOrCancelHouseDTO
     * @return
     */
    @PutMapping("/rentingHourseRegister/releaseOrCancel")
    R releaseOrCancelHouse(@RequestBody ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO);

    /**
     * 删除房源信息
     * @param registerId
     * @return
     */
    @DeleteMapping("/rentingHourseRegister/delete")
    R deleteRentingHouse(@RequestParam("registerId") Long registerId);

    /**
     * 获取详情-房源信息
     * @param registerId
     * @return
     */
    @GetMapping("/rentingHourseRegister/get")
    R getRentingHouse(@RequestParam("registerId") Long registerId);

    /**
     * 附近的房源
     */
    @PostMapping("/rentingHourseRegister/nearby")
    R nearby(@RequestBody NearbyDTO nearbyDTO);

    /**
     * 小程序分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/houseList")
    R pageRentingHouseApplet(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);

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

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

    /**
     * 新增数据
     *
     * @param rentingHourseOrder 实体对象
     * @return 新增结果
     */
    @PostMapping("/rentingHourseOrder")
    R insertRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrder);

    /**
     * 修改数据
     *
     * @param rentingHourseOrdervo 实体对象
     * @return 修改结果
     */
    @PostMapping("/rentingHourseOrder/update")
    R updateRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrdervo);

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

    /**
     * 支付回调处理订单状态以及房屋状态
     */
    @PostMapping("/rentingHourseOrder/wxNotify")
    R wxNotifyRentingHourseOrder(@RequestBody WxPayNotifyOrderVO wxPayNotifyOrderVO);

    /**
     * 支付付款
     */
    @PostMapping("/rentingHourseOrder/wxPay")
    R wxPayRentingHourseOrder(@RequestBody WxPayOrderVO wxPayOrderVO);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/rentingHoursePreOrder/queryAll")
    R selectAllRentingHoursePreOrder(@RequestBody CommonPage commonPage);
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/rentingHoursePreOrder/{id}")
    R selectOneRentingHoursePreOrder(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/rentingHoursePreOrder")
    R insertRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);

    /**
     * 修改数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/rentingHoursePreOrder/update")
    R updateRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);

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

    /**
     * 普通订单统计
     */
    @PostMapping("/rentingHourseOrder/statics")
    R staticsRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrderVO);

    /**
     * 定金订单统计
     */
    @PostMapping("/rentingHoursePreOrder/statics")
    R staticsRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);

    /**
     * 获取房屋租赁配置
     * @return
     * @param type
     */
    @GetMapping("/rentingHousesConfig/getConfig")
    R getRentingHouseConfig(@RequestParam("type") Integer type);

    @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
    @Async
    void updateAllHouseUnionAppCode();

    /**
     * 西区大屏治理数据
     */
    @GetMapping("/screen/getWestScreenStatics")
    R westScreenStatics();

    /**
     * 西区大屏一标三实数据
     * @return  西区大屏一标三实数据
     */
    @GetMapping("/screen/getComprehensivePopulationStatics")
    R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId);

    @GetMapping("/screen/getComprehensiveStreetList")
    R getComprehensiveStreetList();

    /**
     * 通过社区id查询社区账号密码
     * @param communityId   社区id
     * @return  查询社区账号密码
     */
    @GetMapping("/screen/getCommunityPassword")
    R getCommunityPassword(@RequestParam("communityId") Long communityId);

    @GetMapping("/reserve/bigScreenStaticsReserve")
    R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId);

    /**
     * 党员活动折线图
     * @param communityId
     * @return
     */
    @GetMapping("/bigscreen/party/partyActivityLine")
    R partyActivityLine(@RequestParam("communityId")Long communityId);

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

    /**
     * 社区服务大屏数据分析接口
     */
    @GetMapping("/screen/serviceData")
    R serviceData(@RequestParam("communityId")Long communityId);

    /**
     * 服务居民接口
     */
    @GetMapping("/screen/serviceUser")
    R serviceUser(@RequestParam("communityId") Long communityId);

    /**
     * 大数据分析平台-居民自治
     * @param communityId
     * @return
     */
    @GetMapping("/screen/resident/autonomy")
    R getResidentAutonomy(@RequestParam("communityId") Long communityId);

    /**
     * 大数据分析平台-清网治格
     * @param communityId
     * @return
     */
    @GetMapping("/screen/grids/governance")
    R getGridsGovernance(@RequestParam("communityId") Long communityId);

    /**
     * 大数据分析平台-社区服务
     * @param communityId
     * @return
     */
    @GetMapping("/screen/community/service")
    R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 分页获取热度排行商家
     * @param pagePopularMerchantDTO
     * @return
     */
    @PostMapping("/screen/merchant/popular")
    R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);

    /**
     * 新版大屏首页接口
     */
    @GetMapping("/screen/indexInfo")
    R indexInfo(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-微心愿
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/microWish")
    R indexMicroWish(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-随手拍
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/easyPhoto")
    R indexEasyPhoto(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-随手拍展示列表
     * @return
     */
    @PostMapping("/screen/index/easyPhotoList")
    R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-社区问卷
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/questionnaire")
    R indexQuestionnaire(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-社区动态
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/dyn")
    R indexDyn(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-社区动态展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/dynList")
    R indexDynList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-邻里圈
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/neighbor")
    R indexNeighbor(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-邻里圈展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/neighborList")
    R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-便民商家
     * @param communityId
     * @return
     */
    @GetMapping("/screen/index/merchant")
    R indexMerchant(@RequestParam("communityId") Long communityId);

    /**
     * 首页二级页面-商家展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/merchantList")
    R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-微心愿展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/microWishList")
    R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 首页二级页面-社区问卷展示列表
     * @param pageBaseDTO
     * @return
     */
    @PostMapping("/screen/index/questionnaireList")
    R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);

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

    @GetMapping("/screen/hmk/partyProjectActivityLine")
    R partyProjectActivityLine();

    @PostMapping("/screen/hmk/projectActivityTop")
    R projectActivityProject(@RequestBody CommonPage commonPage);

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


    /**
     * 通过userId查询
     *
     * @param userId 主键
     * @return 单条数据
     */
    @GetMapping("/comActSocialOrg/selectByUserId")
    R selectOneByUserId(@RequestParam("userId") Long userId);

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

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

    /**
     * 新增数据
     *
     * @param comActSocialMember 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialMember")
    public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember);

    /**
     * 批量新增数据
     *
     * @param comActSocialMember 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialProjectMember/batch")
    public R comActSocialMemberInsertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember);

    /**
     * 修改数据
     *
     * @param comActSocialMember 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialMember/update")
    public R comActSocialMemberUpdate(@RequestBody ComActSocialMemberVO comActSocialMember);

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

    /**
     * 新增社工
     * @param comActSocialWorkerAddDTO
     * @return 新增结果
     */
    @PostMapping("/comActSocialWorker/add")
    R addComactsocialworker(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO);

    /**
     * 修改社工
     * @param comActSocialWorkerEditDTO
     * @return 维护结果
     */
    @PostMapping("/comActSocialWorker/edit")
    R editComactsocialworker(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO);

    /**
     * 分页查找社工
     * @param pageComActSocialWorkerDTO
     * @return 维护结果
     */
    @PostMapping("/comActSocialWorker/page")
    R queryComactsocialworker(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO);//返回 R<IPage<ComActSocialWorkerVO>>

    /**
     * 删除社工
     * @param comActSocialWorkerDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/comActSocialWorker/delete")
    R deleteComactsocialworker(@RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO);

    /**
     * 查询社工详细信息
     * @param id 社工 id
     * @return 查找结果
     */
    @PostMapping("/comActSocialWorker/{id}")
    R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id);

    /**
     * 批量导入社工
     *
     * @param list 社工集合
     */
    @PostMapping("/comActSocialWorker/input")
    R listSaveSocialWorkerExcelVO(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId);

    /**
     *活动查询社工列表
     * @param commonPage
     * @return
     */
    @PostMapping("/comActSocialWorker/activity")
    R activity(@RequestBody CommonPage commonPage);

    /**
     * 社工查询活动
     * @param commonPage
     * @return
     */
    @PostMapping("/comActSocialWorker/activityList")
    R activityList(@RequestBody CommonPage commonPage);

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

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

    /**
     * 修改数据
     *
     * @param comActSocialWorkerServiceVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialWorkerService/update")
    R updateComActSocialWorkerService(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO);

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

    /**
     * 平台详情接口
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActSocialProject/{id}")
    R selectOneComActSocialProject(@PathVariable("id") Long id);

    /**
     * 根据项目id分页获取关联项目
     */
    @PostMapping("/comActSocialProject/getRelation")
    R getRelationComActSocialProject(@RequestBody CommonPage commonPage);

    /**
     * 新增数据
     *
     * @param socialProjectVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialProject")
    R insertComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
    /**
     * 修改数据
     *
     * @param socialProjectVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialProject/update")
    R updateComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActSocialProject/del")
    R deleteComActSocialProject(@RequestParam("id") Long id);
    /**
     * 小程序详情接口
     * @param id
     * @return
     */
    @GetMapping("/comActSocialProject/getApplet")
    R getAppletComActSocialProject(@RequestParam("id") Long id);

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

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

    /**
     * 新增数据
     *
     * @param comActSocialProjectMemberVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialProjectMember")
    public R insertComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);

    /**
     * 修改数据
     *
     * @param comActSocialProjectMemberVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialProjectMember/update")
    public R updateComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);

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

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

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


    /**
     * 新增数据
     *
     * @param comActSocialProjectPublicityVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialProjectPublicity")
    public R insertComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);

    /**
     * 修改数据
     *
     * @param comActSocialProjectPublicityVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialProjectPublicity/update")
    public R updateComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActSocialProjectPublicity/del")
    public R deleteComActSocialProjectPublicity(@RequestParam("id") Long id);
    /**
     * 多条删除数据
     *
     * @param ids 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActSocialProjectPublicity/delBatch")
    public R delBatchComActSocialProjectPublicity(@RequestParam("ids") List<Long> ids);

    /**
     * 根据projectId查询所有进度
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActSocialProjectSchedule/queryAll")
    public R selectAllComActSocialProjectSchedule(@RequestBody CommonPage commonPage);

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

    /**
     * 新增数据
     *
     * @param comActSocialProjectScheduleVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialProjectSchedule")
    public R insertComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);

    /**
     * 修改数据
     *
     * @param comActSocialProjectScheduleVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialProjectSchedule/update")
    public R updateComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);

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

    /**
     * 项目分类级联
     * @param comActColumnVO
     * @return
     */
    @PostMapping("/comActColumn/queryLevel")
    public R queryLevel(@RequestBody ComActColumnVO comActColumnVO);

    @PostMapping("/comActRaffle/queryAll")
    R selectAllComActRaffle(@RequestBody CommonPage commonPage);

    @GetMapping("/comActRaffle/detail")
    R selectOneComActRaffle(@RequestParam("id") Long id,@RequestParam("userId")Long userId);

    @PostMapping("/comActRaffle")
    R insertComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);

    @PostMapping("/comActRaffle/update")
    R updateComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);

    @GetMapping("/comActRaffle/del")
    R deleteComActRaffle(@RequestParam("id") Long id);

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

    @GetMapping("/comActRaffleRecord/queryPrize")
    R queryPrize(@RequestParam("id")Long id);

    /**
     * 生成二维码
     * @param qrCodeVO
     * @return
     */
    @PostMapping("/comActRaffleRecord/getQRCode")
    R getRaffleQRCode(@RequestBody QRCodeVO qrCodeVO);

    /**
     * 修改数据
     *
     * @param comActRaffleRecordVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActRaffleRecord/update")
    R updateRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO);

    @PostMapping("/comActRaffleRecord")
    R insertRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActRaffleRecord/{id}")
    R selectOneRaffleRecord(@PathVariable("id") Long id);
    /**
     * 导出
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActRaffleRecord/export")
    R exportComActRaffleRecord(@RequestBody CommonPage commonPage);

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