From 07e29422c8559295bd6a5594e6f95f9e08d0bc95 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 31 三月 2022 17:07:48 +0800
Subject: [PATCH] 党建bug修改
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java | 54 +++++++++++++++++++++++++++++-------------------------
1 files changed, 29 insertions(+), 25 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 058d062..e12540f 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,22 +1,25 @@
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.vos.visit.EventVisitingTasksDetailsVO;
-import com.panzhihua.common.service.grid.GridService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
+import javax.annotation.Resource;
+
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
+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.EventVisitingTasksDetailsVO;
+import com.panzhihua.common.service.grid.GridService;
-/** 走访任务
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 走访任务
+ *
* @author xyh
* @date 2021/6/23 9:01
*/
@@ -26,39 +29,40 @@
@Api(tags = {"走访任务"})
public class VisitingTasksApi extends BaseController {
-
@Resource
private GridService gridService;
@ApiOperation(value = "走访记录-xyh", response = AppVisitTasksVO.class)
@PostMapping("/list")
- public R list(@RequestBody EventTasksQuery query){
- query.setCommunityId(this.getCommunityId());
+ public R list(@RequestBody EventTasksQuery query) {
+ // 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);
+ public R taskList(@RequestBody EventTasksQuery query) {
+ // query.setCommunityId(this.getCommunityId());
+ // query.setUserId(this.getUserId());
+ return gridService.appTaskList(query);
}
@ApiOperation(value = "走访详情-xyh", response = EventVisitingTasksDetailsVO.class)
@GetMapping("/detail/{id}")
- public R detail(@PathVariable Long id){
+ public R detail(@PathVariable Long id) {
return gridService.detail(id);
}
- @ApiOperation(value = "开始走访-xyh")
- @PostMapping("/start")
- public R start(@RequestParam("id") Long id){
- return gridService.start(id);
+ // @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