From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 552 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 376 insertions(+), 176 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 65ec706..76ad4d4 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
@@ -2,6 +2,9 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.vos.community.*;
+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;
@@ -15,72 +18,6 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
-import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
-import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussCommentUserDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussOptionUserDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussUserDTO;
-import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
-import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
-import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
-import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
-import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
-import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
-import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
-import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
-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.ComMngPopulationTagDTO;
-import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
-import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
-import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
-import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO;
-import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO;
-import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthDeleteDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthEditDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
-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.GrantRewardDTO;
-import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
-import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
-import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
-import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngRealAssetsDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
-import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
-import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
@@ -102,6 +39,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;
@@ -170,52 +108,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.ComActActRegistVO;
-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.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
-import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
-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.ComActVO;
-import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
-import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
-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.ComMngPopulationKeyExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
-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.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;
@@ -223,6 +115,7 @@
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.reserve.*;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
@@ -324,6 +217,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 +234,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);
/**
* 活动报名名单
@@ -1740,7 +1693,7 @@
*/
@PostMapping("/convenient/serve/import")
R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,
- @RequestParam(value = "communityId", required = false) Long communityId);
+ @RequestParam(value = "communityId", required = false) Long communityId);
/**
* 导出房屋信息
@@ -1856,7 +1809,7 @@
*/
@PostMapping("/common/data/company/import")
R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list,
- @RequestParam("communityId") Long communityId);
+ @RequestParam("communityId") Long communityId);
/**
* 实有单位导出
@@ -1911,7 +1864,7 @@
*/
@PostMapping("/common/data/assets/import")
R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list,
- @RequestParam("communityId") Long communityId);
+ @RequestParam("communityId") Long communityId);
/**
* 实有单位导出
@@ -2059,7 +2012,7 @@
*/
@PostMapping("/village/import")
R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list,
- @RequestParam(value = "communityId") Long communityId);
+ @RequestParam(value = "communityId") Long communityId);
/**
* 批量导入实有人口
@@ -2072,7 +2025,7 @@
*/
@PostMapping("/common/data/population/import")
R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入吸毒人员
@@ -2085,7 +2038,7 @@
*/
@PostMapping("/common/data/population/importDrug")
R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入社区矫正人员
@@ -2098,7 +2051,7 @@
*/
@PostMapping("/common/data/population/importCorrect")
R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入重精人员
@@ -2111,7 +2064,7 @@
*/
@PostMapping("/common/data/population/importMajor")
R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入邪教人员
@@ -2124,7 +2077,7 @@
*/
@PostMapping("/common/data/population/importCult")
R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入刑释人员
@@ -2137,7 +2090,7 @@
*/
@PostMapping("/common/data/population/importRehabilitation")
R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入重点上访人员
@@ -2150,7 +2103,7 @@
*/
@PostMapping("/common/data/population/importKey")
R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入服刑人员
@@ -2163,7 +2116,7 @@
*/
@PostMapping("/common/data/population/importSentence")
R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入退役军人
@@ -2176,7 +2129,7 @@
*/
@PostMapping("/common/data/population/importVeterans")
R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入残疾人
@@ -2189,7 +2142,7 @@
*/
@PostMapping("/common/data/population/importDisability")
R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 批量导入低保户
@@ -2202,7 +2155,7 @@
*/
@PostMapping("/common/data/population/importLowSecurity")
R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list,
- @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
/**
* 确认导入实有人口（有则更新，无则新建）
@@ -2215,7 +2168,7 @@
*/
@PostMapping("/common/data/population/import/confirm")
R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list,
- @RequestParam(value = "communityId") Long communityId);
+ @RequestParam(value = "communityId") Long communityId);
/**
* 分页查询实有人口
@@ -2375,7 +2328,7 @@
/**
* 小程序-问卷调查详情
- *
+ *
* @param userId
* 用户id
* @param questId
@@ -2387,7 +2340,7 @@
/**
* 小程序-新增问卷调查浏览数量
- *
+ *
* @param questId
* 问卷调查id
* @return 增加结果
@@ -2397,7 +2350,7 @@
/**
* 小程序-用户弹窗添加不在提醒接口
- *
+ *
* @param questId
* 问卷id
* @param userId
@@ -2409,7 +2362,7 @@
/**
* 社区后台-查询问卷调查详情
- *
+ *
* @param questId
* 问卷id
* @return 问卷调查详情
@@ -2933,7 +2886,7 @@
*/
@PostMapping("/common/data/population/edit")
R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO,
- @RequestParam("communityId") Long communityId);
+ @RequestParam("communityId") Long communityId);
/**
* 微心愿删除
@@ -2989,7 +2942,7 @@
* @return 详情
*/
@GetMapping("/detailworkguide")
- R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("conmunityId") Long conmunityId);
+ R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId);
/**
* 办事指南_分页
@@ -3624,7 +3577,7 @@
*/
@PostMapping("/eldersauthelderly/batchSave")
R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,
- @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy);
+ @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy);
/**
* 批量保存楼栋
@@ -3635,7 +3588,7 @@
*/
@PostMapping("/building/batchSave")
R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,
- @RequestParam("communityId") Long communityId);
+ @RequestParam("communityId") Long communityId);
/**
* 插入字典
@@ -3815,7 +3768,7 @@
*/
@PostMapping("/bigscreen/party/ageGender")
R<BigScreenStatisticAgeGender>
- ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
+ ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
/**
* 党建数据概览
@@ -3840,7 +3793,7 @@
*/
@PostMapping("/bigscreen/party/bigscreenPartyactivity")
R<List<BigScreenStatisticPartyActivity>>
- bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
+ bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
/**
* 首页大屏统计接口
@@ -4359,7 +4312,7 @@
/**
* 查询用户交易记录总额
- *
+ *
* @param pageTradeAdminDTO
* 请求参数
* @return 交易记录总额
@@ -4369,7 +4322,7 @@
/**
* 查询用户导出数据
- *
+ *
* @param pageTradeAdminDTO
* 请求参数
* @return 用户导出数据
@@ -4379,7 +4332,7 @@
/**
* 导出奖励台账数据
- *
+ *
* @param pageTradeAdminDTO
* 请求参数
* @return 奖励台账数据
@@ -4389,7 +4342,7 @@
/**
* 查询社区统计数据
- *
+ *
* @param pageTradeAdminDTO
* 查询社区统计数据
* @return 社区统计数据
@@ -4399,7 +4352,7 @@
/**
* 社区随手拍列表统计
- *
+ *
* @param communityId
* 社区id
* @return 统计结果
@@ -4445,7 +4398,7 @@
* @return 邻里圈话题列表
*/
@GetMapping("/neighbor/getNeighborTopicByApp")
- R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);
+ R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero);
/**
* 综治后台-查询社区列表
@@ -4596,7 +4549,7 @@
*/
@GetMapping("/patrolRecord/safetyWorkRecord/detail")
R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId,
- @RequestParam(value = "communityId", required = false) Long communityId);
+ @RequestParam(value = "communityId", required = false) Long communityId);
/**
* 根据巡查记录id查询安全工作记录详情
@@ -4607,7 +4560,7 @@
*/
@GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId,
- @RequestParam(value = "communityId", required = false) Long communityId);
+ @RequestParam(value = "communityId", required = false) Long communityId);
/**
* 分页查询隐患报告
@@ -4678,7 +4631,7 @@
/**
* 小程序-查询积分说明
- *
+ *
* @return 积分说明
*/
@GetMapping("/integral/explain/applets")
@@ -4686,7 +4639,7 @@
/**
* 小程序-用户查询当前社区可领取积分规则列表
- *
+ *
* @param userId
* 用户id
* @param communityId
@@ -4698,7 +4651,7 @@
/**
* 小程序-查询用户积分列表
- *
+ *
* @param userId
* 用户id
* @return 用户积分列表
@@ -4708,7 +4661,7 @@
/**
* 小程序-查询社区积分账户排行榜
- *
+ *
* @param communityRankDTO
* 请求参数
* @return 社区积分账户排行榜
@@ -4718,7 +4671,7 @@
/**
* 小程序-查询用户社区积分明细
- *
+ *
* @param communityTradeDTO
* 请求参数
* @return 用户社区积分明细
@@ -4728,7 +4681,7 @@
/**
* 社区后台-根据社区id查询社区下积分规则列表
- *
+ *
* @param integralRuleDTO
* 请求参数
* @return 社区下积分规则列表
@@ -4738,7 +4691,7 @@
/**
* 社区后台-编辑社区积分规则
- *
+ *
* @param integralRuleDTO
* 请求参数
* @return 编辑结果
@@ -4748,7 +4701,7 @@
/**
* 社区后台-分页查询社区下积分明细记录
- *
+ *
* @param integralRuleDTO
* 请求参数
* @return 社区下积分明细记录
@@ -4758,7 +4711,7 @@
/**
* 给用户添加积分
- *
+ *
* @param integralUserDTO
* 请求参数
* @return 添加积分结果
@@ -4768,7 +4721,7 @@
/**
* 根据社区活动id查询社区活动报名人员列表
- *
+ *
* @param activityId
* 活动id
* @return 社区活动报名人员列表
@@ -4788,7 +4741,7 @@
/**
* 根据id查询值班表
- *
+ *
* @param rotaId
* 值班表id
* @return 值班表详情
@@ -4808,7 +4761,7 @@
/**
* 批量删除值班表
- *
+ *
* @param rotaIds
* 值班ids
* @return 删除结果
@@ -4855,7 +4808,7 @@
/**
* 查询社区所有列表
- *
+ *
* @return 社区列表
*/
@GetMapping("/switch/community/all/list")
@@ -4863,7 +4816,7 @@
/**
* 根据名字查询所有社区列表
- *
+ *
* @param name
* 社区名字
* @return 社区列表
@@ -4873,7 +4826,7 @@
/**
* 根据经纬度以及距离搜索附近社区列表
- *
+ *
* @param communityDTO
* 请求参数
* @return 社区列表
@@ -4883,7 +4836,7 @@
/**
* 问卷调查统计汇总
- *
+ *
* @param summaryDTO
* 请求参数
* @return 统计汇总
@@ -4893,7 +4846,7 @@
/**
* 问卷调查统计汇总导出数据查询
- *
+ *
* @param questId
* 调查问卷id
* @return 调查统计汇总导出数据
@@ -4903,7 +4856,7 @@
/**
* 问卷调查统计汇总表头统计
- *
+ *
* @param questId
* 调查问卷id
* @return 问卷调查统计汇总表头统计数据
@@ -4913,7 +4866,7 @@
/**
* 运营后台-新增随手拍分类
- *
+ *
* @param addPhotoClassify
* 请求参数
* @return 新增结果
@@ -4923,7 +4876,7 @@
/**
* 运营后台-编辑随手拍分类
- *
+ *
* @param addPhotoClassify
* 请求参数
* @return 编辑结果
@@ -4933,7 +4886,7 @@
/**
* 运营后台-分页查询随手拍分类
- *
+ *
* @param addPhotoClassify
* 请求参数
* @return 随手拍分类列表
@@ -4943,7 +4896,7 @@
/**
* 运营后台-随手拍分类详情
- *
+ *
* @param id
* 随手拍分类id
* @return 随手拍分类
@@ -4953,7 +4906,7 @@
/**
* 运营后台-随手拍分类删除
- *
+ *
* @param id
* 随手拍分类id
* @return 删除结果
@@ -4963,7 +4916,7 @@
/**
* 运营后台-查询随手拍分类列表
- *
+ *
* @return 随手拍分类列表
*/
@GetMapping("/classify/admin/list")
@@ -4971,7 +4924,7 @@
/**
* 社区后台-切换随手拍公示状态
- *
+ *
* @param comActEasyPhotoVO
* 请求参数
* @return 切换结果
@@ -4981,7 +4934,7 @@
/**
* 查询社区待处理随手拍id集合
- *
+ *
* @param communityId
* 社区id
* @return 社区待处理随手拍id集合
@@ -4989,6 +4942,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,@RequestParam("isBack") Integer isBack);
+
+ @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);
/**
* 活动签到
*
@@ -5030,4 +5192,42 @@
*/
@PostMapping("/activity/default-praise")
R timedTaskActivityDefaultPraise();
+
+
+
+ /**
+ * 小程序-用户新增话题
+ * @param circleTopicAppDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/neighbor/addNeighborTopicByApp")
+ R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO);
+
+ /**
+ * 小程序-删除邻里圈
+ * @param circleTopicAppDTO 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/neighbor/circleTopicAppDTO")
+ R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);
+
+ /**
+ * 获取系统配置value
+ * @param key 系统配置code
+ * @param communityId 社区id
+ * @return 系统配置value
+ */
+ @GetMapping("/sys/conf/getSysConfValue")
+ R getSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 新增系统配置
+ * @param key 系统配置code
+ * @param communityId 社区id
+ * @param name 系统配置名称
+ * @param value 系统配置value
+ * @return 新增结果
+ */
+ @GetMapping("/sys/conf/addSysConfValue")
+ R addSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId,@RequestParam("name") String name,@RequestParam("value") String value);
}
--
Gitblit v1.7.1