From b0b1e641a31a0494262187f97034807fc53515dd Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 28 Oct 2024 15:49:39 +0800
Subject: [PATCH] Merge branch 'gzdyh_test' into gzdyh_grid
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridToDoController.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridToDoController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridToDoController.java
index 6de3cea..df1fd46 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridToDoController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridToDoController.java
@@ -1,15 +1,14 @@
package cn.huge.module.grid.controller;
import cn.huge.base.common.bo.R;
-import cn.huge.module.grid.domain.vo.GridGetToDoVo;
-import cn.huge.module.grid.domain.vo.GridIdsVo;
-import cn.huge.module.grid.domain.vo.GridToDoVo;
+import cn.huge.module.sys.vo.GridToDoBacthVo;
+import cn.huge.module.sys.vo.GridGetToDoVo;
+import cn.huge.module.sys.vo.GridIdsVo;
+import cn.huge.module.sys.vo.GridTaskVo;
+import cn.huge.module.sys.vo.GridToDoVo;
import cn.huge.module.grid.service.GridToDoService;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -32,6 +31,17 @@
return gridToDoService.createToDo(gridToDoVo);
}
+ @PostMapping("/batch-create-todo")
+ public R<List<GridToDoVo>> batchCreateToDo(@RequestBody GridToDoBacthVo gridToDoVo) {
+ return gridToDoService.batchCreateToDo(gridToDoVo);
+ }
+
+ /**
+ * 查询待办
+ *
+ * @param gridGetToDoVo
+ * @return
+ */
@PostMapping("/get-todo")
public R<List<GridToDoVo>> getToDo(@RequestBody GridGetToDoVo gridGetToDoVo) {
return gridToDoService.getToDo(gridGetToDoVo);
@@ -48,6 +58,11 @@
return gridToDoService.updateToDo(gridToDoVo);
}
+ @PostMapping("/batch-update-todo")
+ public R<List<GridToDoVo>> batchUpdateToDo(@RequestBody List<GridToDoVo> gridToDoVos) {
+ return gridToDoService.batchUpdateToDo(gridToDoVos);
+ }
+
/**
* 删除待办
*
@@ -58,4 +73,38 @@
public R<String> deleteTodo(@RequestBody GridIdsVo gridIdsVo) {
return gridToDoService.deleteToDo(gridIdsVo);
}
+
+ /**
+ * 批量创建待办
+ *
+ * @param gridToDoBacthVo
+ * @param unitId
+ * @return
+ */
+ @PostMapping("/create-task-todo")
+ public R<List<GridToDoVo>> createTaskToDo(@RequestBody GridToDoBacthVo gridToDoBacthVo, String unitId) {
+ return gridToDoService.createTaskToDo(gridToDoBacthVo, unitId);
+ }
+
+ /**
+ * 批量更新待办
+ *
+ * @param gridToDoVo
+ * @return
+ */
+ @PostMapping("/update-task-todo")
+ public R<List<GridToDoVo>> updateTaskTodo(@RequestBody GridToDoVo gridToDoVo, @RequestParam(value = "previousTaskId") String previousTaskId) {
+ return gridToDoService.updateTaskToDo(gridToDoVo, previousTaskId);
+ }
+
+ /**
+ * 批量删除待办
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("/delete-task-todo")
+ public R<String> deleteTaskTodo(@RequestBody GridTaskVo gridTaskVo) {
+ return gridToDoService.deleteTaskToDo(gridTaskVo);
+ }
}
--
Gitblit v1.8.0