From 0a4aee700a60c4b28248f3d1a7f4f91376b68492 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:46:47 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into shuangzheng2

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  428 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 391 insertions(+), 37 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index e33f9e4..2cfd92a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3,16 +3,15 @@
 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.*;
-import com.panzhihua.common.model.dtos.community.building.admin.*;
 import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
-import com.panzhihua.common.model.dtos.community.cluster.admin.*;
 import com.panzhihua.common.model.dtos.property.CommonPage;
 import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
 import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
@@ -23,10 +22,7 @@
 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;
@@ -35,12 +31,6 @@
 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;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -52,7 +42,6 @@
 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;
@@ -61,6 +50,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;
@@ -109,7 +109,6 @@
 import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
 import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO;
 import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
-import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
 import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
 import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
 import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
@@ -157,7 +156,6 @@
 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;
 import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterAdminDto;
@@ -180,18 +178,12 @@
 import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
 import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
 import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
-import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
 import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
 import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
 import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
 import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
 import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
 import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
-import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
-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;
@@ -244,13 +236,30 @@
 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;
 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;
@@ -286,7 +295,6 @@
 import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
 import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
 import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
-import com.panzhihua.common.model.dtos.property.CommonPage;
 import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
 import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
 import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
@@ -320,7 +328,6 @@
 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.community.ActivitySignVO;
 import com.panzhihua.common.model.vos.community.BatchhouseVO;
 import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
@@ -387,7 +394,6 @@
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
 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;
@@ -396,8 +402,6 @@
 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;
@@ -2269,10 +2273,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);
 
     /**
      * 分页查询街道
@@ -5506,7 +5511,7 @@
      * @return 社区列表
      */
     @GetMapping("/switch/community/all/list")
-    R communitySwitchList(@RequestParam("areaCode") String areaCode);
+    R communitySwitchList(@RequestParam("appId") String appId);
 
     /**
      * 根据名字查询所有社区列表
@@ -5516,7 +5521,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);
 
     /**
      * 根据经纬度以及距离搜索附近社区列表
@@ -6334,7 +6339,7 @@
      * @return 单条数据
      */
     @GetMapping("/comActFourMember/{id}")
-    R comActFourMemberSelectOne(@PathVariable("id") Integer id);
+    R comActFourMemberSelectOne(@PathVariable("id") Long id);
 
     /**
      * 新增数据
@@ -7658,7 +7663,7 @@
 
     @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
     @Async
-    void updateAllHouseUnionAppCode();
+    void updateAllHouseUnionAppCode(@RequestParam("areaCode") String areaCode);
 
     /**
      * 西区大屏治理数据
@@ -8792,10 +8797,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);
 
     /**
      * 分页查询所有数据
@@ -9906,7 +9912,355 @@
                                        @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,
-                                       @RequestParam(value = "loginAccount",required = false) String loginAccount);
+                                       @RequestParam(value = "unitId",required = false) Long unitId,@RequestParam(value = "loginAccount",required = false) String loginAccount);
+    /**
+     * 批量删除活动
+     * @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);
 }

--
Gitblit v1.7.1