java/zhihuishenqu.git

			@@ -1,5 +1,6 @@
			package com.panzhihua.common.service.community;

			import java.util.Date;
			import java.util.List;

			import com.panzhihua.common.model.dtos.PageBaseDTO;
			@@ -26,6 +27,7 @@
			import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
			import com.panzhihua.common.model.dtos.shop.*;
			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;
			@@ -218,68 +220,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.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.ComActActivityTypeVO;
			import com.panzhihua.common.model.vos.community.ComActActivityVO;
			import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
			import com.panzhihua.common.model.vos.community.ComActColumnVO;
			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.QRActivityCodeVO;
			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;
			@@ -576,6 +516,16 @@
			*/
			@PostMapping("pageeasyphoto")
			R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

			/**
			* 分页查询随手拍浪潮专用
			*
			* @param comActEasyPhotoVO
			* 查询参数
			* @return 心愿列表
			*/
			@GetMapping("pageEasyPhotoAdminLC")
			R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize);

			/**
			* 随手拍详情
			@@ -2255,6 +2205,19 @@
			R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);

			/**
			* 查询省下所有区域 tree结构
			*
			* @param provinceAdcode
			* 省份code
			* @param areaCode
			* @return 查询结果
			*/
			@GetMapping("/common/data/area/basiclevel")
			R getCityTreeByCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
			@RequestParam(value = "areaCode", required = false) String areaCode,
			@RequestParam(value = "appId", required = false) String appId);

			/**
			* 分页查询街道
			*
			* @param pageComStreetDTO
			@@ -3419,7 +3382,7 @@
			* @return 详情
			*/
			@GetMapping("/detailworkguide")
			R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId);
			R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, @RequestParam("communityId") String communityId);

			/**
			* 办事指南_分页
			@@ -3520,6 +3483,15 @@
			@PostMapping("/neighbor/pageNeighborByAdmin")
			R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);

			/**
			* 统计大屏查询清单列表
			*
			* @param comActNeighborCircleAdminDTO
			* 请求参数
			* @return 邻里圈列表
			*/
			@PostMapping("/neighbor/pageNeighborByBigScreen")
			R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
			/**
			* 后台修改邻里圈
			*
			@@ -10803,7 +10775,7 @@
			* @return 订单详情
			*/
			@GetMapping("/shopFlower/orderDetail")
			R orderDetailFlower(@RequestParam("orderId") Long orderId);
			R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone);

			/**
			* 根据订单id取消订单
			@@ -11102,5 +11074,401 @@
			* @param type
			* @return
			*/
			@GetMapping("/shopFlower/selectOrderLineChart") R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type);
			@GetMapping("/shopFlower/selectOrderLineChart") R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type,@RequestParam("tab") Integer tab);

			/**
			* 统计上架的上下架商品数量
			* @param userId
			* @return
			*/
			@GetMapping("/shopFlower/countSaleByUserId")
			R countSaleByUserId(@RequestParam("userId") Long userId);

			/**
			* 查询统计基础数据
			* @return
			*/
			@GetMapping("/selectBasicData")
			R selectBasicData();

			/**
			* 统计在职干部特长
			* @return
			*/
			@GetMapping("/statisticsPbMemberType")
			R statisticsPbMemberType();


			/**
			* 统计单位
			* @return
			*/
			@GetMapping("/selectUnitByNatureName")
			R selectUnitByNatureName();

			/**
			* 大屏-社区活动分页
			* @return
			*/
			@PostMapping("pageActivityBigScreen")
			R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO);

			/**
			* 疫情防控健康码统计
			* @return
			*/
			@GetMapping("/comActAcidRecord/selectColorMarkGroup")
			R selectColorMarkGroup();


			@GetMapping("easyphoto/selectStatisticsPhoto")
			R selectStatisticsPhoto();

			/**
			* 获取商家周围 n(km)的自提点数量
			*
			* @param distance
			* @return
			*/
			@GetMapping("/convenient/point/findPointNumByDistance")
			R findPointNumByDistance(@RequestParam("distance") Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng);


			/**
			* 普达大屏-自治动态
			* */
			@GetMapping("/pudaScreen/autonomyDynamic")
			R autonomyDynamic();

			/**
			* 普达大屏-红色物业
			* */
			@GetMapping("/pudaScreen/propertyDynamic")
			R propertyDynamic();

			/**
			* 普达大屏-党建数据
			**/
			@GetMapping("/pudaScreen/partyData")
			R partyData();

			/**
			*
			* 普达大屏-居民信息
			* */
			@GetMapping("/pudaScreen/peopleInfo")
			R peopleInfo();


			/**
			* 普达大屏-小区院落
			* */
			@GetMapping("/pudaScreen/countryard")
			R countryard();

			/**
			* 普达大屏-基础数据
			* */
			@GetMapping("/pudaScreen/basicData")
			R basicData();

			/**
			* 普达大屏-特殊人群
			* */
			@GetMapping("/pudaScreen/specialPeople")
			R specialPeople();



			/**
			* 通过洗车订单查询银联订单
			*
			* @return
			*/
			@GetMapping("/unionpay/detail")
			R queryById(@RequestParam("Id") String id);


			/**
			* 通过银联订单查询洗车订单
			*
			* @return
			*/
			@GetMapping("/unionpay/unionpayDetail")
			R carWashById(@RequestParam("Id") String id);

			/**
			* 新增洗车订单和银联订单关系
			* @param carWashId
			* @param unionpayOrderId
			* @param money
			* @return
			*/
			@PostMapping("/unionpay/add")
			int add(@RequestParam("carWashId") String carWashId,
			@RequestParam("unionpayOrderId") String unionpayOrderId,
			@RequestParam("money") String money);






			/*********************************************************************************************************
			*
			*
			* 最美志愿者
			*
			*
			* *********************************************************************************************************/
			@GetMapping("/MostBeautifu/queryById")
			public R queryById2(@RequestParam("id") String Id);


			/**
			* 分页查询
			* @param name
			* @param unmountType
			* @return
			*/
			@GetMapping("/MostBeautifu/getqueryList")
			public R queryList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize")int pageSize,
			@RequestParam(value = "name", required = false) String name,
			@RequestParam(value = "unmountType", required = false) String unmountType);



			/**
			* 新增
			* @param mostBeautifulVolunteerVO
			* @return
			*/
			@PostMapping("/MostBeautifu/addMostBeautiful")
			public R insertMostBeautifulVolunteer(@RequestBody MostBeautifulVolunteerVO mostBeautifulVolunteerVO);


			/**
			* 更新
			* @param mostBeautifulVolunteerVO
			* @return
			*/
			@PostMapping("/MostBeautifu/upMostBeautiful")
			public R updateById(@RequestBody MostBeautifulVolunteerVO mostBeautifulVolunteerVO);


			/**
			* 删除
			* @param Id
			* @return
			*/
			@DeleteMapping("/MostBeautifu/delectVuId")
			public R deleteById(@RequestParam("id") String Id);


			/********************************************************************************************************************
			*
			*
			* 志愿者活动
			*
			*
			*******************************************************************************************************************/
			/**
			* 获取单个详情
			* @param id
			* @return
			*/
			@GetMapping("Volunteer/queryById")
			R volunteerQueryById(@RequestParam("id") String id);

			/**
			* 分页查询
			* @param
			* @return
			*/
			@GetMapping("Volunteer/queryList")
			R volunteerQueryList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize,
			@RequestParam(value = "name", required = false) String name,
			@RequestParam(value = "acState", required = false) String acState,
			@RequestParam(value = "acType", required = false) String acType,
			@RequestParam(value = "actityBeginTime", required = false) Date actityBeginTime,
			@RequestParam(value = "actityEndTime", required = false) Date actityEndTime);

			/**
			* 新增
			* @param
			* @return
			*/
			@PostMapping("Volunteer/insertVolunteer")
			R insertVolunteer(@RequestBody VolunteerActivityVO volunteerActivityVO);


			@PostMapping("Volunteer/updateById")
			R volunteerUpdateById(@RequestBody VolunteerActivityVO volunteerActivityVO);


			@DeleteMapping("Volunteer/deleteById")
			R volunteerDeleteById(@RequestParam("id") String id);



			/**
			* 定时刷新活动状态
			* @return
			*/
			@GetMapping("/Volunteer/timedTaskVolunteerActivitiesJobHandler")
			public R timedTaskVolunteerActivitiesJobHandler();


			/*******************************************************************************************************************
			*
			*
			* 志愿者活动类型
			*
			*
			*******************************************************************************************************************/

			/**
			* 分页查询
			* @param
			* @return
			*/
			@GetMapping("/VolunteerType/volunteerTypeGetList")
			public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
			@RequestParam("pageSize") int pageSize);

			/**
			* 新增
			* @param
			* @return
			*/
			@PostMapping("/VolunteerType/insertvolunteerType")
			public R insertvolunteerType(@RequestBody VolunteerTypeVO volunteerTypeVO);

			/**
			* 更新
			* @param volunteerTypeVO
			* @return
			*/
			@PostMapping("/VolunteerType/volunteerTypeUpdate")
			public R volunteerTypeUpdate(@RequestBody VolunteerTypeVO volunteerTypeVO);

			/**
			* 删除
			* @param id
			* @return
			*/
			@DeleteMapping("/VolunteerType/volunteerTypeDelete")
			public R volunteerTypeDelete(@RequestParam("id") String id);

			/*****************************************************************************************************************
			*
			*
			* 志愿者参加活动
			*
			*
			****************************************************************************************************************/
			/**
			* 志愿者单个详情
			* @param id
			* @return
			*/
			@GetMapping("/VolunteerActivitiesPeople/vapGetById")
			public R vapGetById(@RequestParam("id") String id);

			/**
			* 参与人员列表
			* @param activityId
			* @param communityId
			* @return
			*/
			@GetMapping("/VolunteerActivitiesPeople/vapGetList")
			public R vapGetList(@RequestParam("activityId") String activityId,
			@RequestParam("communityId") String communityId);

			/**
			* 添加参与人员
			* @param volunteerActivitiesPeopleVO
			* @return
			*/
			@PostMapping("/VolunteerActivitiesPeople/vapInsert")
			public R vapInsert(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);

			/**
			* 修改参与人员
			* @param volunteerActivitiesPeopleVO
			* @return
			*/
			@PostMapping("/VolunteerActivitiesPeople/vapUpdate")
			public R vapUpdate(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);

			/**
			* 删除参与人员
			* @param id
			* @return
			*/
			@DeleteMapping("/VolunteerActivitiesPeople/vapDelete")
			public R vapDelete(@RequestParam("id") String id);


			/**
			* 志愿者活动奖励发放
			* @param grantIntegral
			* @return
			*/
			@PostMapping("/grantIntegral")
			public R grantIntegral(@RequestBody GrantIntegral grantIntegral);

			/**************************************************************************************************************
			*
			*
			* 积分明细记录
			*
			*****************************************************************************************************************/
			/**
			* 获取单个详情
			*
			* @param id
			* @return
			*/
			@GetMapping("/VolunteerIntegralRecord/getId")
			public R VolunteerIntegralRecordGetId(@RequestParam("id") String id);

			/**
			* 分页查询
			*
			* @param
			* @return
			*/
			@GetMapping("/VolunteerIntegralRecord/getId")
			public R VolunteerIntegralRecordGetList(int pageNum, int pageSize,
			@RequestParam("userId") String userId);

			/**
			* 新增
			*
			* @param
			* @return
			*/
			@PostMapping("/VolunteerIntegralRecord/insertVolunteer")
			public R VolunteerIntegralRecordInsertVolunteer(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO);

			/**
			* 便捷
			* @param
			* @return
			*/
			@PostMapping("/VolunteerIntegralRecord/updateId")
			public R VolunteerIntegralRecordUpdateId(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO);

			/**
			* 删除
			* @param id
			* @return
			*/
			@DeleteMapping("/VolunteerIntegralRecord/deleteId")
			public R VolunteerIntegralRecordDeleteId(@RequestParam("id") String id);


			}