java/zhihuishenqu.git

			@@ -2,25 +2,6 @@

			import java.util.List;

			import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
			import com.panzhihua.common.model.dtos.community.*;
			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;
			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.neighbor.*;
			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;
			import org.springframework.web.bind.annotation.DeleteMapping;
			import org.springframework.web.bind.annotation.GetMapping;
			@@ -55,6 +36,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 +102,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 +161,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;
			@@ -236,14 +229,77 @@
			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;
			@@ -6707,7 +6763,7 @@
			* @return
			*/
			@GetMapping("/comActWarehouseBase")
			public R comActWarehouseBaseSelectOne(Long communityId);
			public R comActWarehouseBaseSelectOne(@RequestParam("communityId") Long communityId);

			/**
			* 新增数据
			@@ -6723,4 +6779,80 @@
			*/
			@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);
			}