From d111b0f70d5930935fc8658e389a1b7b1947f74a Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期二, 26 十月 2021 13:22:27 +0800 Subject: [PATCH] 社工 政策文件开发 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 432 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 420 insertions(+), 12 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 7ecdd82..abfe3f6 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 @@ -1,9 +1,13 @@ package com.panzhihua.common.service.community; +import java.io.Serializable; import java.util.List; +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.*; +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; @@ -14,11 +18,10 @@ 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.warehouse.ComActWarehouseApplyVO; -import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO; -import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO; import io.swagger.annotations.ApiOperation; import com.panzhihua.common.model.vos.community.*; import org.springframework.cloud.openfeign.FeignClient; @@ -55,6 +58,8 @@ import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO; import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO; import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO; +import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO; +import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseUserVO; import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO; import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO; import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO; @@ -119,6 +124,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.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; +import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterMemberAdminDto; +import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterAdminDto; +import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterMemberAdminDto; import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO; import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO; import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO; @@ -171,6 +183,9 @@ 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.ComActWarehouseDonatesDTO; +import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO; +import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO; @@ -231,19 +246,77 @@ 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.ComActActivityVO; +import com.panzhihua.common.model.vos.community.ComActCommiteeVO; +import com.panzhihua.common.model.vos.community.ComActDynVO; +import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; +import com.panzhihua.common.model.vos.community.ComActFourMemberVO; +import com.panzhihua.common.model.vos.community.ComActMessageBackVO; +import com.panzhihua.common.model.vos.community.ComActMessageVO; +import com.panzhihua.common.model.vos.community.ComActMicroWishVO; +import com.panzhihua.common.model.vos.community.ComActReserveCommitVO; +import com.panzhihua.common.model.vos.community.ComActSocialOrgVO; +import com.panzhihua.common.model.vos.community.ComActVO; +import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO; +import com.panzhihua.common.model.vos.community.ComActWorkGuideVO; +import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO; +import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO; +import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO; +import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO; +import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO; +import com.panzhihua.common.model.vos.community.ComMngCarExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationCorrectExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationCultExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationDisabilityExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationDrugExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationElderExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationKeyExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationPensionExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationVO; +import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO; +import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO; +import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO; +import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO; +import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO; +import com.panzhihua.common.model.vos.community.ComMngStructAreaVO; +import com.panzhihua.common.model.vos.community.ComMngStructHouseVO; +import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO; +import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO; +import com.panzhihua.common.model.vos.community.ComMngVillageVO; +import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; +import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO; +import com.panzhihua.common.model.vos.community.ComOpsHouseVO; +import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO; +import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO; +import com.panzhihua.common.model.vos.community.ComPropertyVO; +import com.panzhihua.common.model.vos.community.ComStreetVO; +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.ResetComActMessageVO; +import com.panzhihua.common.model.vos.community.SignactivityVO; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender; 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.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.warehouse.ComActWarehouseApplyVO; +import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO; +import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO; +import com.panzhihua.common.model.vos.community.warehouse.WarehouseDonatesExcelVO; import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO; import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO; import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO; @@ -2122,7 +2195,7 @@ * @return 新增结果 */ @PostMapping("/addstreet") - R addStreet(@RequestBody ComStreetVO comStreetVOO); + R<ComStreetVO> addStreet(@RequestBody ComStreetVO comStreetVOO); /** * 删除街道 @@ -2456,12 +2529,12 @@ /** * 批量删除实有人口 * - * @param Ids + * @param ids * 实有人口id集合 * @return 删除结果 */ @PostMapping("/common/data/population/delete") - R deletePopulations(@RequestBody List<Long> Ids); + R deletePopulations(@RequestBody List<Long> ids,@RequestParam("communityId") Long communityId); /** * 根据社区id查询所有实有人口 @@ -6640,6 +6713,103 @@ public R detailHousesUser(@RequestParam("id") Long id); /** + * 社区后台-分页查询楼栋列表 + * @param pageBuildingListDto 请求参数 + * @return 楼栋列表 + */ + @PostMapping("/building/page/admin/") + R pageBuildingAdmin(@RequestBody PageBuildingListDto pageBuildingListDto); + + /** + * 社区后台-查询楼栋列表表头统计数据 + * @param communityId 社区id + * @return 楼栋列表表头统计数据 + */ + @GetMapping("/building/header/statistics/") + R buildingListHeaderStatisticsAdmin(@RequestParam("communityId") Long communityId); + + /** + * 社区后台-查询楼栋详情 + * @param id 楼栋id + * @return 楼栋详情 + */ + @GetMapping("/building/detail/admin/") + R detailBuildAdmin(@RequestParam("id") Long id); + + /** + * 查询楼栋下单元列表 + * @param id 楼栋id + * @return 单元列表 + */ + @GetMapping("/building/unit/list/admin") + R buildingUnitListAdmin(@RequestParam("id") Long id); + + /** + * 查询楼栋单元下房屋列表 + * @param unitHouseListDto 请求参数 + * @return 单元列表 + */ + @PostMapping("/building/unit/house/list/admin") + R buildingUnitHouseListAdmin(@RequestBody PageBuildingUnitHouseListDto unitHouseListDto); + + /** + * 查询楼栋单元下房屋详情 + * @param houseId 房屋id + * @param communityId 社区id + * @return 房屋详情 + */ + @GetMapping("/building/unit/house/detail/admin") + R unitHouseDetailAdmin(@RequestParam("houseId") Long houseId,@RequestParam("communityId") Long communityId); + + /** + * 查询社区下小区列表 + * @param communityId 社区id + * @return 小区列表 + */ + @GetMapping("/building/village/list/admin") + R buildingVillageListAdmin(@RequestParam("communityId") Long communityId); + + /** + * 添加楼栋下单元 + * @param addBuildingUnitDto 请求参数 + * @return 添加结果 + */ + @PostMapping("/building/unit/add/admin") + R addBuildingUnitAdmin(@RequestBody AddBuildingUnitDto addBuildingUnitDto); + + /** + * 修改楼栋下单元 + * @param editBuildingUnitDto 请求参数 + * @return 修改结果 + */ + @PostMapping("/building/unit/edit/admin") + R editBuildingUnitAdmin(@RequestBody EditBuildingUnitDto editBuildingUnitDto); + + /** + * 添加户室 + * @param addBuildingHouseDto 请求参数 + * @return 添加结果 + */ + @PostMapping("/building/house/add/admin") + R addBuildingHouseAdmin(@RequestBody AddBuildingHouseDto addBuildingHouseDto); + + /** + * 修改户室 + * @param editBuildingHouseDto 请求参数 + * @return 修改结果 + */ + @PostMapping("/building/house/edit/admin") + R editBuildingHouseAdmin(@RequestBody EditBuildingHouseDto editBuildingHouseDto); + + /** + * 删除户室下人员关联信息 + * @param housePopulationDto 请求参数 + * @return 删除结果 + */ + @PostMapping("/building/house/population/delete/admin") + R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto); + + /** * 分页查询所有数据 * * @param commonPage 查询实体 @@ -6707,7 +6877,7 @@ * @return */ @GetMapping("/comActWarehouseBase") - public R comActWarehouseBaseSelectOne(Long communityId); + public R comActWarehouseBaseSelectOne(@RequestParam("communityId") Long communityId); /** * 新增数据 @@ -6723,4 +6893,242 @@ */ @PostMapping("/comActWarehouseApply/export") public R comActWarehouseApplyExport(@RequestBody CommonPage commonPage); + + /** + * 后台导入捐赠物品 + * @param list + * @return + */ + @PostMapping("/comActWarehouseDonates/import") + R batchImportWarehouseDonates(@RequestBody List<WarehouseDonatesExcelVO> list); + + /** + * 后台导出捐赠物品表格 + * @param exportDonatesDTO + * @return + */ + @PostMapping("/comActWarehouseDonates/donates/export") + R exportDonates(@RequestBody ExportDonatesDTO exportDonatesDTO); + + /** + * 分页查询捐赠物品 + * @param pageDonatesDTO + * @return + */ + @PostMapping("/comActWarehouseDonates/donates/page") + R pageDonates(@RequestBody PageDonatesDTO pageDonatesDTO); + + /** + * 新增物品捐赠 + * @param comActWarehouseDonatesDTO + * @return + */ + @PostMapping("/comActWarehouseDonates/donates/add") + R addDonates(@RequestBody ComActWarehouseDonatesDTO comActWarehouseDonatesDTO); + + /** + * 查看物品捐赠详情 + * @param donatesId + * @param isWhich + * @param userId + * @return + */ + @GetMapping("/comActWarehouseDonates/donates/get") + R getDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("isWhich") Integer isWhich, @RequestParam("userId") Long userId); + + /** + * 捐赠物品后台签收 + * @param comActWarehouseDonatesDTO + * @return + */ + @PostMapping("/comActWarehouseDonates/donates/signing") + R signingDonates(@RequestBody ComActWarehouseDonatesDTO comActWarehouseDonatesDTO); + + /** + * 用户取消捐赠 + * @param donatesId + * @param currentUser + * @return + */ + @GetMapping("/comActWarehouseDonates/donates/cancel") + R cancelDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("currentUser") Long currentUser); + + /** + * 捐赠物品统计查询 + * @param communityId + * @return + */ + @GetMapping("/comActWarehouseDonates/donates/statistics") + R getDonatesStatistics(@RequestParam("communityId") Long communityId); + + /** + * 分页查询所有数据 + * + * @param commonPage 查询实体 + * @return 所有数据 + */ + @PostMapping("/comActWarehouseOperation/queryAll") + public R comActWarehouseOperationSelectAll(@RequestBody CommonPage commonPage); + + /** + * 物品领用 + * @param comActWarehouseApplyDTO + * @return + */ + @PostMapping("/comActWarehouseDonates/donates/apply") + R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO); + + /** + * 实有房屋数据修复定时任务 + * @return 实有房屋数据修复定时任务 + */ + @GetMapping("/population/house/status/task") + R timedTaskHouseJobHandler(); + + /** + * 分页查询所有数据 + * + * @param commonPage 查询实体 + * @return 所有数据 + */ + @PostMapping("/comActColumn/queryAll") + R comActColumnSelectAll(@RequestBody CommonPage commonPage); + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/comActColumn/{id}") + R comActColumnSelectOne(@PathVariable("id") Long id); + + /** + * 新增数据 + * + * @param comActColumn 实体对象 + * @return 新增结果 + */ + @PostMapping("/comActColumn") + R comActColumnInsert(@RequestBody ComActColumnVO comActColumn); + + /** + * 修改数据 + * + * @param comActColumn 实体对象 + * @return 修改结果 + */ + @PostMapping("/comActColumn/update") + R comActColumnUpdate(@RequestBody ComActColumnVO comActColumn); + + /** + * 删除数据 + * + * @param id 主键结合 + * @return 删除结果 + */ + @GetMapping("/comActColumn/del") + R comActColumnDelete(@RequestParam("id") Long id); + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/comActSocialOrg/{id}") + R comActSocialOrgSelectOne(@PathVariable("id") Long id); + + /** + * 分页查询所有数据 + * + * @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("/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); } -- Gitblit v1.7.1