From cf2e6ce54f82c61606a01f816f7cac8b3a967809 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 30 六月 2021 18:07:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java | 71 ++++++++++++++---------------------
1 files changed, 28 insertions(+), 43 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
index a83e833..4dcd2a2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.panzhihua.common.model.dtos.IdDTO;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO;
import com.panzhihua.common.model.dtos.grid.LcEventVisitingTasksListDTO;
import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO;
@@ -19,116 +20,107 @@
import java.util.List;
/**
+ *
* @author cedoo email:cedoo(a)qq.com
* @version 1.0
- * @date 2021-05-26
* @since 1.0
- */
+ * @date 2021-05-26
+ * */
@Slf4j
@RestController
@RequestMapping("/eventvisitingtasks")
-public class EventVisitingTasksApi {
+public class EventVisitingTasksApi{
@Resource
private EventVisitingTasksService eventVisitingTasksService;
/**
* 统计走访任务
- *
* @param communityId
* @return
*/
@GetMapping("/count")
- R count(@RequestParam("communityId") Long communityId) {
+ R count(@RequestParam("communityId") Long communityId){
return eventVisitingTasksService.count(communityId);
}
/**
* 修改重点人群走访记录
- *
* @param eventVisitingTasksEditDTO
* @return 维护结果
*/
@PostMapping("/edit")
- R edit(@RequestBody EventVisitingTasksEditDTO eventVisitingTasksEditDTO) {
+ R edit(@RequestBody EventVisitingTasksEditDTO eventVisitingTasksEditDTO){
return eventVisitingTasksService.edit(eventVisitingTasksEditDTO);
}
/**
* 分页查找重点人群走访记录
- *
* @param pageEventVisitingTasksDTO
* @return 维护结果
*/
@PostMapping("/page")
- R<IPage<EventVisitingTasksVO>> query(@RequestBody PageEventVisitingTasksDTO pageEventVisitingTasksDTO) {
+ R<IPage<EventVisitingTasksVO>> query(@RequestBody PageEventVisitingTasksDTO pageEventVisitingTasksDTO){
return eventVisitingTasksService.query(pageEventVisitingTasksDTO);
}
/**
* 查询重点人群走访记录详细信息
- *
* @param id 重点人群走访记录 id
* @return 查找结果
*/
@PostMapping("/{id}")
- R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(@PathVariable("id") Long id) {
+ R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(@PathVariable("id") Long id){
return eventVisitingTasksService.eventVisitingTasksDetails(id);
}
-
/**
* 删除走访任务
- *
- * @param ids
+ * @param idDTO
* @param communityId
* @return
*/
@PostMapping("/delete")
- R delete(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId) {
- return eventVisitingTasksService.delete(ids, communityId);
+ R delete(@RequestBody IdDTO idDTO, @RequestParam("communityId") Long communityId){
+ return eventVisitingTasksService.delete(idDTO,communityId);
}
/**
* 需走访人员列表
- *
* @param query
* @return
*/
@PostMapping("/visitorList")
- R visitorList(@RequestBody EventVisitListQuery query) {
+ R visitorList(@RequestBody EventVisitListQuery query){
return eventVisitingTasksService.visitorList(query);
}
/**
* 新增走访任务
- *
- * @param ids
+ * @param idDTO
* @param communityId
* @param userId
* @return
*/
@PostMapping("/add")
- R add(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) throws Exception {
- return eventVisitingTasksService.add(ids, communityId, userId);
+ R add(@RequestBody IdDTO idDTO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) throws Exception {
+ return eventVisitingTasksService.add(idDTO,communityId,userId);
}
/**
* 走访记录
- *
* @param query
* @return
*/
@PostMapping("/list")
- R list(@RequestBody EventTasksQuery query) {
+ R list(@RequestBody EventTasksQuery query){
return eventVisitingTasksService.list(query);
}
/**
* 走访任务列表
- *
* @param query
* @return
*/
@@ -140,7 +132,6 @@
/**
* app走访任务列表
- *
* @param query
* @return
* @throws Exception
@@ -153,7 +144,6 @@
/**
* 导出
- *
* @param query
* @return
*/
@@ -164,7 +154,6 @@
/**
* app走访详情
- *
* @param id
* @return
*/
@@ -175,45 +164,41 @@
/**
* 撤销走访
- *
- * @param id
+ * @param idDTO
* @return
*/
- @PostMapping("/cancel/{id}")
- R cancel(@PathVariable("id") Long id) {
- return eventVisitingTasksService.cancel(id);
+ @PostMapping("/cancel")
+ R cancel(@RequestBody IdDTO idDTO){
+ return eventVisitingTasksService.cancel(idDTO);
}
/**
* 恢复
- *
- * @param id
+ * @param idDTO
* @return
*/
- @PostMapping("/reset/{id}")
- R reset(@PathVariable("id") Long id) {
- return eventVisitingTasksService.reset(id);
+ @PostMapping("/reset")
+ R reset(@RequestBody IdDTO idDTO){
+ return eventVisitingTasksService.reset(idDTO);
}
/**
* 开始走访
- *
* @param id
* @return
*/
@PostMapping("/start")
- R start(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
- return eventVisitingTasksService.start(id, userId);
+ R start(@RequestParam("id")Long id,@RequestParam("userId")Long userId){
+ return eventVisitingTasksService.start(id,userId);
}
/**
* 完成走访记录
- *
* @param taskCompleteDTO
* @return
*/
@PostMapping("/complete")
- R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO) {
+ R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO){
return eventVisitingTasksService.complete(taskCompleteDTO);
}
--
Gitblit v1.7.1