From 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 05 七月 2021 13:15:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
index 4f80df9..1dfa380 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -1,7 +1,9 @@
package com.panzhihua.common.service.grid;
+import com.panzhihua.common.model.dtos.IdDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO;
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.query.visit.EventVisitListQuery;
import com.panzhihua.common.model.vos.R;
@@ -1127,12 +1129,12 @@
/**
* 删除走访任务
*
- * @param ids
+ * @param idDTO
* @param communityId
* @return
*/
@PostMapping("/eventvisitingtasks/delete")
- R delete(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId);
+ R delete(@RequestBody IdDTO idDTO, @RequestParam("communityId") Long communityId);
/**
* 被走访人员列表
@@ -1157,31 +1159,31 @@
/**
* 撤销走访
*
- * @param id
+ * @param idDTO
* @return
*/
- @PostMapping("/eventvisitingtasks/cancel/{id}")
- R cancel(@PathVariable("id") Long id);
+ @PostMapping("/eventvisitingtasks/cancel")
+ R cancel(@RequestBody IdDTO idDTO);
/**
* 恢复走访
*
- * @param id
+ * @param idDTO
* @return
*/
- @PostMapping("/eventvisitingtasks/reset/{id}")
- R reset(@PathVariable("id") Long id);
+ @PostMapping("/eventvisitingtasks/reset")
+ R reset(@RequestBody IdDTO idDTO);
/**
* 新增走访
*
- * @param ids
+ * @param idDTO
* @param communityId
* @param userId
* @return
*/
@PostMapping("/eventvisitingtasks/add")
- R addVisitingTask(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+ R addVisitingTask(@RequestBody IdDTO idDTO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
/**
* 开始走访
@@ -1200,4 +1202,19 @@
*/
@PostMapping("/eventvisitingtasks/complete")
R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO);
+
+ /**
+ * 查询市平台网格员列表
+ * @return 市平台网格员列表
+ */
+ @GetMapping("/eventgridmemberrelation/lc/list")
+ R gridMemberLcList();
+
+ /**
+ * 综治后台-添加网格员级联列表
+ * @param memberCascadeAddDTO 请求参数
+ * @return 级联列表
+ */
+ @PostMapping("/eventgridmemberrelation/cascade/list")
+ R gridMemberCascadeList(@RequestBody EventGridMemberCascadeAddDTO memberCascadeAddDTO);
}
--
Gitblit v1.7.1