From 16f55b05bd98dff50033991e0b71011578fce892 Mon Sep 17 00:00:00 2001
From: "yang.yongquan" <3395816735@qq.com>
Date: Tue, 5 Jul 2022 20:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80=E4=BA=9Bbu?=
 =?UTF-8?q?g=EF=BC=8C=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E8=8E=B7=E5=BE=97=E5=AD=90=E4=BB=BB=E5=8A=A1=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E4=BA=86=E5=85=B3=E9=97=AD=E5=92=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TaskController.java              | 17 +++++++++++------
 .../projectmanagement/service/ITaskService.java |  2 +-
 .../service/impl/TaskServiceImpl.java           | 12 +++++++++---
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java
index d6a7946..0e782ee 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java
@@ -1,6 +1,8 @@
 package cn.edu.hfut.rmdjzz.projectmanagement.controller;
 
 import cn.edu.hfut.rmdjzz.projectmanagement.entity.Task;
+import cn.edu.hfut.rmdjzz.projectmanagement.exception.BadRequestException;
+import cn.edu.hfut.rmdjzz.projectmanagement.service.IProjectGroupService;
 import cn.edu.hfut.rmdjzz.projectmanagement.service.ITaskService;
 import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseList;
 import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseMap;
@@ -20,6 +22,9 @@ public class TaskController {
     @Autowired
     private ITaskService taskService;
 
+    @Autowired
+    private IProjectGroupService projectGroupService;
+
     @SneakyThrows
     @GetMapping("/subtask/{fatherId}")
     public ResponseList<Task> getSubTaskList(
@@ -39,14 +44,14 @@ public class TaskController {
     }
 
     @SneakyThrows
-    @PostMapping
+    @PostMapping("/subtask/exist")
     public ResponseMap createTask(
             @RequestHeader("Token") String token,
             @PathVariable("projectId") Integer projectId,
-            @RequestBody Task task
+            @RequestParam("taskId") Long taskId
     ) {
-        task.setTaskProjectId(projectId);
-        task = taskService.insertTask(token, task);
-        return ResponseMap.ofSuccess("新建成功", task);
+        return ResponseMap.ofSuccess("返回成功")
+                .put("existSubTask" ,taskService.existSubTask(token, projectId, taskId));
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java
index 43e7605..ae15b08 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java
@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface ITaskService extends IService<Task> {
     List<Task> getTaskList(String token,Integer projectId,Long fatherId) throws BadRequestException;
-    List<List<Long>> getTaskAndSubTask(Long taskId);
+    Boolean existSubTask(String token, Integer projectId, Long taskId) throws BadRequestException;
     Boolean deleteTaskAndSubTask(String token, Integer projectId, Long taskId) throws BadRequestException;
     Boolean closeTaskAndSubTask(String token, Integer projectId, Long taskId) throws  BadRequestException;
     Integer checkHolder(Integer staffId,Long taskId);
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java
index b66bd6e..8783a17 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java
@@ -38,7 +38,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
         return baseMapper.selectList(Wrappers.<Task>lambdaQuery().eq(Task::getTaskProjectId, projectId).eq(Task::getTaskFatherId, fatherId));
     }
 
-    //FIXME:
+    @Override
+    public Boolean existSubTask(String token, Integer projectId, Long taskId) throws BadRequestException {
+        if(projectGroupService.getUserLevelInGroup(token, projectId) == 0) {
+            throw new BadRequestException("请求参数错误");
+        }
+        return baseMapper.exists(Wrappers.<Task>lambdaQuery().eq(Task::getTaskFatherId, taskId));
+    }
+
     @Transactional(isolation = Isolation.SERIALIZABLE, rollbackFor = Exception.class)
     @Override
     public Boolean deleteTaskAndSubTask(String token, Integer projectId, Long taskId) throws BadRequestException {
@@ -67,7 +74,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
         }
     }
 
-    //FIXME:
     @Transactional(isolation = Isolation.SERIALIZABLE, rollbackFor = Exception.class)
     @Override
     public Boolean closeTaskAndSubTask(String token, Integer projectId, Long taskId) throws BadRequestException {
@@ -188,7 +194,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
         if (!task.checkInsert()) {
             throw new BadRequestException("工作项参数错误");
         }
-        if (!checkHolder(token, task.getTaskFatherId())) {
+        if (checkHolder(token, task.getTaskFatherId()) == 0) {
             throw new BadRequestException("非法的父级参数");
         }
         try {