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/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java
index 2d58aa4..9354692 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java
@@ -1,11 +1,10 @@
package com.panzhihua.grid_app.api;
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO;
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.visit.AppVisitTasksVO;
-import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO;
+import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.vos.visit.EventVisitingTasksDetailsVO;
import com.panzhihua.common.service.grid.GridService;
import io.swagger.annotations.Api;
@@ -33,15 +32,16 @@
@ApiOperation(value = "走访记录-xyh", response = AppVisitTasksVO.class)
@PostMapping("/list")
public R list(@RequestBody EventTasksQuery query){
- query.setCommunityId(this.getCommunityId());
+// query.setCommunityId(this.getCommunityId());
return gridService.list(query);
}
@ApiOperation(value = "走访任务-xyh", response = AppVisitTasksVO.class)
@PostMapping("/taskList")
public R taskList(@RequestBody EventTasksQuery query){
- query.setCommunityId(this.getCommunityId());
- return gridService.taskList(query);
+// query.setCommunityId(this.getCommunityId());
+// query.setUserId(this.getUserId());
+ return gridService.appTaskList(query);
}
@ApiOperation(value = "走访详情-xyh", response = EventVisitingTasksDetailsVO.class)
@@ -50,15 +50,16 @@
return gridService.detail(id);
}
- @ApiOperation(value = "开始走访-xyh")
- @PostMapping("/start")
+// @ApiOperation(value = "开始走访-xyh")
+// @PostMapping("/start")
public R start(@RequestParam("id") Long id){
return gridService.start(id,this.getUserId());
}
@ApiOperation(value = "完成走访记录-xyh")
@PostMapping("/complete")
- public R complete(@RequestBody @Validated EventVisitCompleteDTO taskCompleteDTO){
+ public synchronized R complete(@RequestBody @Validated EventVisitCompleteDTO taskCompleteDTO){
+ taskCompleteDTO.setUserId(this.getUserId());
return gridService.complete(taskCompleteDTO);
}
}
--
Gitblit v1.7.1