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/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   92 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 87 insertions(+), 5 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 31c40fc..9cdf825 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
@@ -10,10 +10,7 @@
 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.easyPhoto.AddEasyPhotoActivityDTO;
-import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
-import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
-import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.*;
 import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
 import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
 import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
@@ -337,6 +334,24 @@
     @PostMapping("puteasyphotostatus")
     R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
 
+    /**
+     * 城管随手拍统计
+     */
+    @PostMapping("/esayPhotoCount")
+    R  esayphotoCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+    /**
+     *
+     * 城管安排
+     */
+    @PostMapping("updatePageeasyphoto")
+    R updatePageeasyphoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+    /**
+     *
+     * 随手拍城管导出
+     */
+    @PostMapping("exportEasyPhoto")
+    R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO);
     /**
      * 新增社区
      *
@@ -4217,6 +4232,9 @@
     @PostMapping("timedTaskActivityNotice")
     R timedTaskActivityNotice();
 
+    /**
+     * 定时任务检测待发布，调研中的问卷调查状态
+     */
     @PostMapping("timedTaskQuestionnaire")
     R timedTaskQuestionnaire();
 
@@ -4265,5 +4283,69 @@
      * @return  问卷调查统计汇总表头统计数据
      */
     @GetMapping("/questnaire/statisticsSummary/header")
-    R statisticsSummaryHeader(@RequestParam("questId") Long questId);
+    R statisticsSummaryHeader(@RequestParam("questId") Long questId,@RequestParam("communityId") Long communityId);
+
+
+    /**
+     * 运营后台-新增随手拍分类
+     * @param addPhotoClassify  请求参数
+     * @return  新增结果
+     */
+    @PostMapping("/classify/admin/add")
+    R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);
+
+    /**
+     * 运营后台-编辑随手拍分类
+     * @param addPhotoClassify  请求参数
+     * @return  编辑结果
+     */
+    @PostMapping("/classify/admin/edit")
+    R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);
+
+    /**
+     * 运营后台-分页查询随手拍分类
+     * @param addPhotoClassify  请求参数
+     * @return  随手拍分类列表
+     */
+    @PostMapping("/classify/admin/page")
+    R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);
+
+    /**
+     * 运营后台-随手拍分类详情
+     * @param id    随手拍分类id
+     * @return  随手拍分类
+     */
+    @GetMapping("/classify/admin/detail")
+    R detailPhotoClassify(@RequestParam("id") Long id);
+
+    /**
+     * 运营后台-随手拍分类删除
+     * @param id    随手拍分类id
+     * @return  删除结果
+     */
+    @GetMapping("/classify/admin/delete")
+    R deletePhotoClassify(@RequestParam("id") Long id);
+
+    /**
+     * 运营后台-查询随手拍分类列表
+     * @return  随手拍分类列表
+     */
+    @GetMapping("/classify/admin/list")
+    R listPhotoClassify();
+
+    /**
+     * 社区后台-切换随手拍公示状态
+     * @param comActEasyPhotoVO 请求参数
+     * @return  切换结果
+     */
+    @PostMapping("/easyphoto/switch/publicity")
+    R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+    /**
+     * 查询社区待处理随手拍id集合
+     * @param communityId   社区id
+     * @return  社区待处理随手拍id集合
+     */
+    @GetMapping("/easyphoto/noHandle/list")
+    R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId);
 }

--
Gitblit v1.7.1