bug修改

101captain

2022-07-20 c40f8e3d2e08e108780091776437242528bf61d6

 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.PageEnterpriseTypeDTO;
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;
@@ -190,6 +207,9 @@
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.enterprise.AddEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.EditEnterpriseDTO;
import com.panzhihua.common.model.dtos.community.enterprise.PageEnterpriseDTO;
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;
@@ -242,6 +262,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 +356,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 +2305,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);

    /**
     * 分页查询街道
@@ -5941,6 +5980,10 @@
    @PostMapping("/neighbor/update")
    R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);

    @PostMapping("/neighbor/serviceStatic")
    R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);


    /**
     * 获取系统配置value
     * @param key   系统配置code
@@ -7644,7 +7687,7 @@

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

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

    /**
     * 分页查询所有数据
@@ -9878,5 +9922,114 @@
    R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);

    @GetMapping("/bcRegion/levelList")
    R 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 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);
}