java/zhihuishenqu.git

			@@ -2,6 +2,7 @@

			import java.util.List;

			import io.swagger.annotations.ApiOperation;
			import org.springframework.cloud.openfeign.FeignClient;
			import org.springframework.web.bind.annotation.DeleteMapping;
			import org.springframework.web.bind.annotation.GetMapping;
			@@ -102,6 +103,7 @@
			import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
			import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
			import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
			import com.panzhihua.common.model.dtos.community.reserve.*;
			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;
			@@ -324,6 +326,16 @@
			R listActivitySign(@RequestBody ActivitySignVO activitySignVO);

			/**
			* description getSignLists 查询活动报名名单
			* @param activitySignVO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/8/24 14:03
			*/
			@PostMapping("/activity/sign/getList")
			R getSignLists(@RequestBody ActivitySignVO activitySignVO);

			/**
			* description listActivityRegists 分页查询活动评价
			* @param comActActEvaluateVO 活动评价vo
			* @return R 分页查询结果
			@@ -331,17 +343,67 @@
			* @date 2021/8/24 14:03
			*/
			@PostMapping("/activity/evaluate/page")
			R pageActivityRegists(@RequestBody ComActActEvaluateVO comActActEvaluateVO);
			R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO);

			/**
			* description getEvaluateListsByIds 批量查询活动评价
			* @param ids ids
			* description getEvaluateLists 查询活动评价
			* @param comActActEvaluateVO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/8/24 14:03
			*/
			@PostMapping("/activity/evaluate/getList")
			R getEvaluateListsByIds(@RequestBody List<Long> ids);
			R getEvaluateLists(@RequestBody ComActActEvaluateVO comActActEvaluateVO);

			/**
			* description pageActivityRegists 分页查询活动签到
			* @param comActActRegistVO 活动签到vo
			* @return R 分页查询结果
			* @author txb
			* @date 2021/8/24 14:03
			*/
			@PostMapping("/activity/regist/page")
			R pageActivityRegists(@RequestBody ComActActRegistVO comActActRegistVO);

			/**
			* description getRegistLists 查询活动签到
			* @param comActActRegistVO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/8/25 9:33
			*/
			@PostMapping("/activity/regist/getList")
			R getRegistLists(@RequestBody ComActActRegistVO comActActRegistVO);

			/**
			* description getRegistLists 查询活动未签到
			* @param comActActRegistVO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/8/25 9:33
			*/
			@PostMapping("/activity/noRegist/getList")
			R getNoRegistLists(@RequestBody ComActActRegistVO comActActRegistVO);

			/**
			* description activityStagistics 活动数据统计
			* @param activityId 活动id
			* @return R 统计结果
			* @author txb
			* @date 2021/8/25 13:33
			*/
			@GetMapping("/activity/statistics")
			R activityStatistics(@RequestParam("activityId") Long activityId);

			/**
			* 获取活动历史封面 getPictureList
			* @param userId 用户id
			* @return R 统计结果
			* @author txb
			* @date 2021/8/27 13:33
			*/
			@GetMapping("/activity/picture/getList")
			R getPictureList(@RequestParam("userId") Long userId);

			/**
			* 活动报名名单
			@@ -4989,6 +5051,215 @@
			@GetMapping("/easyphoto/noHandle/list")
			R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId);

			@GetMapping("/reserve/detail")
			R reserveDetail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId);

			@PostMapping("/reserve/commit")
			R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO);

			/**
			* 我的预约/登记
			* @param pageUserReserveDTO
			* @return
			*/
			@PostMapping("/reserve/userReserveList")
			R userReserveList(@RequestBody PageUserReserveDTO pageUserReserveDTO);

			/**
			* 取消预约/登记
			*/
			@PostMapping("/reserve/cancelReserve")
			R userCancelReserve(@RequestBody CancelRecordDTO comActReserveRecordDO);

			/**
			* 预约详情操作记录
			*/
			@PostMapping("/reserve/detailOperation")
			R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO);

			/**
			* 社区后台-分页查询预约登记列表
			* @param pageReserveDTO 请求参数
			* @return 预约登记列表
			*/
			@PostMapping("/reserve/admin/page")
			R pageReserveAdmin(@RequestBody PageReserveAdminDTO pageReserveDTO);

			/**
			* 社区后台-新增预约登记信息
			* @param addReserveDTO 请求参数
			* @return 新增结果
			*/
			@PostMapping("/reserve/admin/add")
			R addReserveAdmin(@RequestBody AddReserveAdminDTO addReserveDTO);

			/**
			* 社区后台-编辑预约登记信息
			* @param editReserveDTO 请求参数
			* @return 新增结果
			*/
			@PostMapping("/reserve/admin/edit")
			R editReserveAdmin(@RequestBody EditReserveAdminDTO editReserveDTO);

			/**
			* 社区后台-修改预约登记状态
			* @param editReserveDTO 请求参数
			* @return 修改结果
			*/
			@PostMapping("/reserve/admin/edit/status")
			R editReserveStatusAdmin(@RequestBody EditComActReserveStatusDTO editReserveDTO);

			/**
			* 社区后台-继续预约登记
			* @param editReserveDTO 请求参数
			* @return 修改结果
			*/
			@PostMapping("/reserve/admin/edit/info")
			R editReserveInfoAdmin(@RequestBody EditComActReserveInfoDTO editReserveDTO);

			/**
			* 社区后台-根据预约登记id查询详情
			* @param reserveId 预约登记id
			* @return 预约登记详情
			*/
			@GetMapping("/reserve/admin/detail")
			R detailReserveAdmin(@RequestParam("reserveId") Long reserveId);

			/**
			* 社区后台-根据社区id统计预约类数据
			* @param makeStatisticsDTO 请求参数
			* @return 统计预约类数据
			*/
			@PostMapping("/reserve/admin/make/statistics")
			R makeStatisticsAdmin(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO);

			/**
			* 社区后台-查询导出预约统计汇总数据
			* @param makeStatisticsDTO 请求参数
			* @return 统计预约类数据
			*/
			@PostMapping("/reserve/admin/make/statistics/export")
			R makeStatisticsExportAdmin(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO);

			/**
			* 社区后台-根据预约id查询预约明细
			* @param pageMakeDTO 请求参数
			* @return 预约明细
			*/
			@PostMapping("/reserve/admin/make/page")
			R pageMakeAdmin(@RequestBody PageReserveMakeAdminDTO pageMakeDTO);

			/**
			* 根据预约记录id查询预约明细操作记录
			* @param reserveRecordId 预约记录id
			* @return 预约明细操作记录
			*/
			@GetMapping("/reserve/admin/make/detail")
			R detailMakeAdmin(@RequestParam("reserveRecordId") Long reserveRecordId);

			/**
			* 批量取消预约记录
			* @param reserveRecordDTO 请求参数
			* @return 取消结果
			*/
			@PostMapping("/reserve/admin/make/cancel")
			R makeCancelAdmin(@RequestBody CancelReserveRecordDTO reserveRecordDTO);

			/**
			* 预约明细导出数据查询
			* @param pageMakeDTO 请求参数
			* @return 预约明细数据
			*/
			@PostMapping("/reserve/admin/make/list/export")
			R exportMakeAdmin(@RequestBody PageReserveMakeAdminDTO pageMakeDTO);

			/**
			* 分页查询登记统计汇总
			* @param registerStatisticsDTO 请求参数
			* @return 登记统计汇总
			*/
			@PostMapping("/reserve/admin/register/page")
			R registerStatisticsAdmin(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO);

			/**
			* 导出登记统计汇总
			* @param registerStatisticsDTO 请求参数
			* @return 登记统计汇总
			*/
			@PostMapping("/reserve/admin/register/export")
			R registerStatisticsExportAdmin(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO);

			/**
			* 分页查询预约处理列表
			* @param pageMakeHandleDTO 请求参数
			* @return 预约处理列表
			*/
			@PostMapping("/reserve/admin/make/handle/page")
			R pageMakeHandleAdmin(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO);

			/**
			* 批量处理预约记录
			* @param makeHandleDTO 请求参数
			* @return 处理结果
			*/
			@PostMapping("/reserve/admin/make/handle")
			R makeHandleAdmin(@RequestBody MakeHandleAdminDTO makeHandleDTO);

			/**
			* 导出预约处理列表数据查询
			* @param pageMakeHandleDTO 请求参数
			* @return 预约处理列表
			*/
			@PostMapping("/reserve/admin/make/handle/export")
			R exportMakeHandleAdmin(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO);

			/**
			* 删除预约登记信息
			* @param reserveId 预约登记id
			* @return 删除结果
			*/
			@GetMapping("/reserve/admin/delete")
			R deleteReserveAdmin(@RequestParam("reserveId") Long reserveId);

			/**
			* 查询社区所有预约信息列表
			* @param communityId 社区id
			* @return 预约信息列表
			*/
			@GetMapping("/reserve/admin/list")
			R listReserveAdmin(@RequestParam("communityId") Long communityId);

			/**
			* 导出登记明细数据
			* @param reserveId 登记id
			* @return 登记明细数据
			*/
			@GetMapping("/reserve/admin/register/list/export")
			R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId);

			/**
			* 查询预约登记题目列表
			* @param reserveId 预约登记id
			* @return 约登记题目列表
			*/
			@GetMapping("/reserve/admin/subject/list")
			R subjectListAdmin(@RequestParam("reserveId") Long reserveId);

			/**
			* 分页查询登记明细列表
			* @param detailedAdminDTO 请求参数
			* @return 登记明细列表
			*/
			@PostMapping("/reserve/admin/register/detailed/list")
			R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

			/**
			* 查询登记详情记录
			* @param reserveRecordId 登记记录id
			* @return 登记详情记录
			*/
			@GetMapping("/reserve/admin/register/detailed/detail")
			R registerDetailedDetailAdmin(@RequestParam("reserveRecordId") Long reserveRecordId);
			/**
			* 活动签到
			*