From 8ec2cdc7531c65e245a2131e60c1c27440eb6a3b Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 30 六月 2021 17:54:40 +0800
Subject: [PATCH] [修改]修改注释和修改浪潮那边的接口字段对应关系
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java | 71 ++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 22 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 6123c83..a83e833 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
@@ -3,15 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO;
+import com.panzhihua.common.model.dtos.grid.LcEventVisitingTasksListDTO;
import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO;
+import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.query.visit.EventVisitListQuery;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.grid.EventDetailsVO;
-import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.vos.visit.EventVisitingTasksDetailsVO;
import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO;
-import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
import com.panzhihua.service_grid.service.EventVisitingTasksService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -20,107 +19,116 @@
import java.util.List;
/**
- *
* @author cedoo email:cedoo(a)qq.com
* @version 1.0
- * @since 1.0
* @date 2021-05-26
- * */
+ * @since 1.0
+ */
@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 communityId
* @return
*/
@PostMapping("/delete")
- R delete(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId){
- return eventVisitingTasksService.delete(ids,communityId);
+ R delete(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId) {
+ return eventVisitingTasksService.delete(ids, communityId);
}
/**
* 需走访人员列表
+ *
* @param query
* @return
*/
@PostMapping("/visitorList")
- R visitorList(@RequestBody EventVisitListQuery query){
+ R visitorList(@RequestBody EventVisitListQuery query) {
return eventVisitingTasksService.visitorList(query);
}
/**
* 新增走访任务
+ *
* @param ids
* @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(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) throws Exception {
+ return eventVisitingTasksService.add(ids, communityId, userId);
}
/**
* 走访记录
+ *
* @param query
* @return
*/
@PostMapping("/list")
- R list(@RequestBody EventTasksQuery query){
+ R list(@RequestBody EventTasksQuery query) {
return eventVisitingTasksService.list(query);
}
/**
* 走访任务列表
+ *
* @param query
* @return
*/
@@ -131,7 +139,21 @@
}
/**
+ * app走访任务列表
+ *
+ * @param query
+ * @return
+ * @throws Exception
+ */
+ @PostMapping("/appTaskList")
+ R appTaskList(@RequestBody EventTasksQuery query) throws Exception {
+
+ return eventVisitingTasksService.appTaskList(query);
+ }
+
+ /**
* 导出
+ *
* @param query
* @return
*/
@@ -142,6 +164,7 @@
/**
* app走访详情
+ *
* @param id
* @return
*/
@@ -152,41 +175,45 @@
/**
* 撤销走访
+ *
* @param id
* @return
*/
@PostMapping("/cancel/{id}")
- R cancel(@PathVariable("id") Long id){
+ R cancel(@PathVariable("id") Long id) {
return eventVisitingTasksService.cancel(id);
}
/**
* 恢复
+ *
* @param id
* @return
*/
@PostMapping("/reset/{id}")
- R reset(@PathVariable("id") Long id){
+ R reset(@PathVariable("id") Long id) {
return eventVisitingTasksService.reset(id);
}
/**
* 开始走访
+ *
* @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