From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 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 9354692..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,21 +1,25 @@
package com.panzhihua.grid_app.api;
-import com.panzhihua.common.controller.BaseController;
-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.dtos.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
*/
@@ -25,40 +29,39 @@
@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());
-// query.setUserId(this.getUserId());
+ 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,this.getUserId());
+ // @ApiOperation(value = "开始走访-xyh")
+ // @PostMapping("/start")
+ public R start(@RequestParam("id") Long id) {
+ return gridService.start(id, this.getUserId());
}
@ApiOperation(value = "完成走访记录-xyh")
@PostMapping("/complete")
- public synchronized 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