修改bug

huanghongfa

2021-07-28 04ee9afc3f33f48327e360be965f882ffd2c16be

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

@@ -5,10 +5,7 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
import com.panzhihua.common.model.dtos.community.bigscreen.*;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
@@ -27,10 +24,7 @@
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.dtos.vaccines.*;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
@@ -48,6 +42,7 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

@@ -123,7 +118,16 @@
     * @return 详情
     */
    @PostMapping("detailactivity")
    R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
    R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId",required = false) Long userId);

    /**
     * 分页活动报名名单
     *
     * @param activitySignVO 查询参数
     * @return 报名人员集合
     */
    @PostMapping("listactivitysign")
    R listActivitySign(@RequestBody ActivitySignVO activitySignVO);

    /**
     * 活动报名名单
@@ -131,8 +135,8 @@
     * @param activitySignVO 查询参数
     * @return 报名人员集合
     */
    @PostMapping("listactivitysign")
    R listActivitySign(@RequestBody ActivitySignVO activitySignVO);
    @PostMapping("listactivitysigns")
    R listActivitySigns(@RequestBody ActivitySignVO activitySignVO);

    /**
     * 新增社区动态
@@ -1433,6 +1437,15 @@
    R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId);

    /**
     * 车辆导出
     *
     * @param exportComMngCarExcelDTO
     * @return
     */
    @PostMapping("/common/data/car/export")
    R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO);

    /**
     * 社区后台实有单位管理列表
     *
     * @param pageComMngRealCompanyDTO
@@ -1440,6 +1453,15 @@
     */
    @PostMapping("/common/data/company/page")
    R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO);

    /**
     * 社区后台实有单位统计
     *
     * @param communityId 社区id
     * @return 统计结果
     */
    @PostMapping("/common/data/company/statistics")
    R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId);

    /**
     * 社区后台添加修改实有单位
@@ -1646,6 +1668,15 @@
    R listVillage(ComMngVillageVO comMngVillageVO);

    /**
     * 根据房屋id查询实有房屋
     *
     * @param villageId 查询条件
     * @return 查询结果
     */
    @PostMapping("/getVillageById")
    R getVillageById(@RequestParam(value = "villageId")Long villageId);

    /**
     * 批量导入实有房屋
     *
     * @param list        实有房屋数据
@@ -1739,6 +1770,15 @@
     */
    @PostMapping("/common/data/population/getList")
    R getPopulationLists(@RequestBody List<Long> Ids);

    /**
     * 根据小区id查询实有人口
     *
     * @param villageId 小区id
     * @return 查询结果
     */
    @PostMapping("/common/data/population/getListByVillageId")
    R getPopulationListByVillageId(@RequestParam("villageId") Long villageId);

    /**
     * 创建调查问卷
@@ -2330,7 +2370,7 @@
     * @return 详情
     */
    @GetMapping("/detailworkguide")
    R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId);
    R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("conmunityId") Long conmunityId);

    /**
     * 办事指南_分页
@@ -2933,6 +2973,24 @@
    R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList, @RequestParam("communityId") Long communityId);

    /**
     * 插入字典
     * @param dictionaryVO  字典数据
     * @return R  是否保存成功
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @PostMapping("/dictionary/insertDiction")
    R  insertDiction(@RequestBody DictionaryVO dictionaryVO);
    /**
     * 插入字典项
     * @param dictionaryVO  字典数据
     * @return R  是否保存成功
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @PostMapping("/dictionary/insertDictionItem")
    R  insertDictionItem(@RequestBody BcDictionaryVO dictionaryVO);
    /**
     * 根据字典key查询字典项
     *
     * @param key
@@ -3118,11 +3176,11 @@
    /**
     * 事件大屏统计接口
     *
     * @param communityId 社区id
     * @param screenEventDTO 请求参数
     * @return 统计结果
     */
    @GetMapping("/screen/getScreenEvent")
    R getScreenEvent(@RequestParam("communityId") Long communityId);
    @PostMapping("/screen/getScreenEvent")
    R getScreenEvent(@RequestBody BigScreenEventDTO screenEventDTO);

    /**
     * 民生大屏统计接口
@@ -3596,4 +3654,94 @@
     */
    @GetMapping("/eventgrid/community/list")
    R getCommunityLists();

    /**
     * 分页查询退役军人列表
     *
     * @param comExServicemanDTO 请求参数
     * @return 退役军人列表
     */
    @PostMapping("/population/page/exServiceman")
    R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO);

    /**
     * 分页查询社区动态分类列表
     * @param comActDynTypeDTO  请求参数
     * @return  动态分类列表
     */
    @PostMapping("/dyn/type/page")
    R pageDynTypeByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);

    /**
     * 查询社区下所有动态分类列表
     * @param comActDynTypeDTO  请求参数
     * @return  动态分类列表
     */
    @PostMapping("/dyn/type/list")
    R getDynTypeListByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);

    /**
     * 添加社区动态分类
     * @param comActDynTypeDTO  请求参数
     * @return  添加结果
     */
    @PostMapping("/dyn/type/add")
    R addDynTypeByAdmin(@RequestBody AddComActDynTypeDTO comActDynTypeDTO);

    /**
     * 编辑社区动态分类
     * @param comActDynTypeDTO  请求参数
     * @return  编辑结果
     */
    @PostMapping("/dyn/type/edit")
    R editDynTypeByAdmin(@RequestBody EditComActDynTypeDTO comActDynTypeDTO);

    /**
     * 删除社区动态分类
     * @param ids   社区动态分类id集合
     * @return  删除结果
     */
    @PostMapping("/dyn/type/delete")
    R deleteDynTypeByAdmin(@RequestBody List<Long> ids);

    /**
     * 随手拍发放奖励
     * @param grantRewardDTO    请求参数
     * @return  发放结果
     */
    @PostMapping("/easyphoto/grantReward")
    R grantReward(@RequestBody GrantRewardDTO grantRewardDTO);

    /**
     * 获取最新活动和用户最新收益
     * @param userId    用户id
     * @param communityId   社区id
     * @return  最新活动和用户最新收益
     */
    @PostMapping("/easyphoto/getUserReward")
    R getUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);

    /**
     * 读取用户随手拍奖励
     * @param userId    用户id
     * @return  读取结果
     */
    @PostMapping("/easyphoto/readUserReward")
    R readUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);

    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 分页集合
     */
    @PostMapping("/patrolRecord/page")
    R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 新增巡查记录
     * @param comSwPatrolRecordAddDTO 新增参数
     * @return 新增结果
     */
    @PostMapping("/patrolRecord/addPatrolRecord")
    R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO);
}