bug修改

puhanshu

2022-07-23 bbda2ee1af4e86d76f93e00386d77efb56c60d5f

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

@@ -6,6 +6,10 @@
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;
@@ -36,6 +40,8 @@
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;
@@ -59,6 +65,17 @@
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;
@@ -242,6 +259,24 @@
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;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
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;
@@ -318,7 +353,7 @@
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.ComActSocialWorkerDetailsVO;
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;
@@ -2267,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);

    /**
     * 分页查询街道
@@ -5504,7 +5540,7 @@
     * @return 社区列表
     */
    @GetMapping("/switch/community/all/list")
    R communitySwitchList(@RequestParam("areaCode") String areaCode);
    R communitySwitchList(@RequestParam("appId") String appId);

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

    /**
     * 根据经纬度以及距离搜索附近社区列表
@@ -7648,7 +7684,7 @@

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

    /**
     * 西区大屏治理数据
@@ -8782,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);

    /**
     * 分页查询所有数据
@@ -9892,5 +9929,359 @@
     */
    @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 = "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);
}