From 07f4cb2bb4e648dcf4e646cd56404be58505eb81 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期六, 21 八月 2021 18:36:21 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index daf0835..0183547 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
@@ -478,6 +479,24 @@
}
/**
+ * 城管安排
+ *
+ * @param comActEasyPhotoVO 查询参数
+ * @return 心愿列表
+ */
+ @PostMapping("updatePageeasyphoto")
+ public R updatePageeasyphoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ return comActEasyPhotoService.updatePageeasyphoto(comActEasyPhotoVO);
+ }
+ /**
+ * 城管导出
+ */
+ @PostMapping("exportEasyPhoto")
+ public R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO){
+ return comActEasyPhotoService.export(exportEasyPhotoDTO);
+ }
+
+ /**
* 随手拍详情
*
* @param id 随手拍主键
@@ -645,6 +664,14 @@
@PostMapping("puteasyphotostatus")
public R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
return comActEasyPhotoService.putEasypHotoStatus(comActEasyPhotoVO);
+ }
+
+ /**
+ * 城管随手拍统计
+ */
+ @PostMapping("/esayPhotoCount")
+ public R esayphotoCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ return comActEasyPhotoService.easyPhotoCount(comActEasyPhotoVO);
}
/**
@@ -1551,6 +1578,12 @@
return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO);
}
+ /**
+ * 小程序-用户弹窗添加不在提醒接口
+ * @param questId 问卷id
+ * @param userId 用户id
+ * @return 添加结果
+ */
@GetMapping("questnaire/add/noNotice")
public R addNoNotice(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId){
return comActQuestnaireService.addNoNotice(questId,userId);
@@ -1839,29 +1872,71 @@
return comActActivityService.timedTaskActivityNotice();
}
-
+ /**
+ * 问卷调查统计汇总
+ * @param summaryDTO 请求参数
+ * @return 统计汇总
+ */
@PostMapping("questnaire/statisticsSummary")
public R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO) {
return comActQuestnaireService.statisticsSummary(summaryDTO);
}
+ /**
+ * 问卷调查统计汇总导出数据查询
+ * @param questId 调查问卷id
+ * @return 调查统计汇总导出数据
+ */
@GetMapping("questnaire/statisticsSummary/export")
public R statisticsSummaryExport(@RequestParam("questId") Long questId) {
return comActQuestnaireService.statisticsSummaryExport(questId);
}
+ /**
+ * 问卷调查统计汇总表头统计
+ * @param questId 调查问卷id
+ * @return 问卷调查统计汇总表头统计数据
+ */
@GetMapping("questnaire/statisticsSummary/header")
- public R statisticsSummaryHeader(@RequestParam("questId") Long questId) {
- return comActQuestnaireService.statisticsSummaryHeader(questId);
+ public R statisticsSummaryHeader(@RequestParam("questId") Long questId,@RequestParam("communityId") Long communityId) {
+ return comActQuestnaireService.statisticsSummaryHeader(questId,communityId);
}
+ /**
+ * 定时任务检测待发布，调研中的问卷调查状态
+ */
@PostMapping("timedTaskQuestionnaire")
public R timedTaskQuestionnaire(){
return comActQuestnaireService.timedTaskQuestionnaire();
}
+ /**
+ * 小程序-新增问卷调查浏览数量
+ * @param questId 问卷调查id
+ * @return 增加结果
+ */
@GetMapping("questnaire/add/view")
public R addQuestnaireView(@RequestParam("questId") Long questId) {
return comActQuestnaireService.addQuestnaireView(questId);
}
+
+ /**
+ * 社区后台-切换随手拍公示状态
+ * @param comActEasyPhotoVO 请求参数
+ * @return 切换结果
+ */
+ @PostMapping("easyphoto/switch/publicity")
+ public R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ return comActEasyPhotoService.easyPhotoSwitchPublicity(comActEasyPhotoVO);
+ }
+
+ /**
+ * 查询社区待处理随手拍id集合
+ * @param communityId 社区id
+ * @return 社区待处理随手拍id集合
+ */
+ @GetMapping("easyphoto/noHandle/list")
+ public R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId) {
+ return comActEasyPhotoService.easyPhotoNoHandleList(communityId);
+ }
}
--
Gitblit v1.7.1