From 7f8b24443557aa6f1b475c354a9df5d9f484611f Mon Sep 17 00:00:00 2001
From: ArgonarioD <arnordorian@sina.com>
Date: Wed, 6 Jul 2022 20:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86merge=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E4=BB=A3=E7=A0=81=E4=B8=A2=E5=A4=B1=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E6=97=A0=E7=94=A8=E7=9A=84import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectGroupController.java    | 36 +++++++++++++++++++
 .../entity/query/ResultProject.java           |  3 --
 .../mapper/ProjectGroupMapper.java            |  4 ---
 .../mapper/ProjectMapper.java                 |  2 --
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java
index 75fefcd..282c889 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java
@@ -1,12 +1,19 @@
 package cn.edu.hfut.rmdjzz.projectmanagement.controller;
 
+import cn.edu.hfut.rmdjzz.projectmanagement.entity.ProjectGroup;
+import cn.edu.hfut.rmdjzz.projectmanagement.exception.BadRequestException;
+import cn.edu.hfut.rmdjzz.projectmanagement.exception.UnauthorizedException;
 import cn.edu.hfut.rmdjzz.projectmanagement.service.IProjectGroupService;
+import cn.edu.hfut.rmdjzz.projectmanagement.utils.TokenUtils;
 import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseList;
+import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseMap;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author 史鹏辉
@@ -25,4 +32,33 @@ public class ProjectGroupController {
         List<Integer> res = projectGroupService.findAllProjectNumber(token, projectId);
         return ResponseList.ofSuccess("查询成功", res);
     }
+
+    @SneakyThrows
+    @GetMapping("/{staffId}")
+    public ResponseMap getDesignatedStaffPosition(
+            @RequestHeader("Token") String token,
+            @PathVariable Integer staffId,
+            @PathVariable Integer projectId
+    ) {
+        if (!Objects.equals(TokenUtils.getStaffId(token), staffId)) {
+            throw new BadRequestException("用户访问错误");
+        }
+        if (projectGroupService.getUserLevelInGroup(token, projectId) == 0) {
+            throw new UnauthorizedException("无该项目访问权限");
+        }
+        return ResponseMap.ofSuccess("查询成功", projectGroupService.getOne(
+                Wrappers.<ProjectGroup>lambdaQuery()
+                        .eq(ProjectGroup::getStaffId, staffId)
+                        .eq(ProjectGroup::getProjectId, projectId)
+        ));
+    }
+
+    @PutMapping("/{staffId}")
+    public ResponseMap updateDesignatedStaffPosition(
+            @RequestHeader("Token") String token,
+            @PathVariable Integer staffId,
+            @PathVariable Integer projectId
+    ) {
+        return ResponseMap.ofSuccess("更新成功");
+    }
 }
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/query/ResultProject.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/query/ResultProject.java
index 2fee21a..482a88f 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/query/ResultProject.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/query/ResultProject.java
@@ -1,8 +1,6 @@
 package cn.edu.hfut.rmdjzz.projectmanagement.entity.query;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -14,7 +12,6 @@ import java.time.LocalDate;
  */
 @Data
 @AllArgsConstructor
-@TableName(autoResultMap = true)
 public class ResultProject {
     @TableId
     Integer projectId;
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/mapper/ProjectGroupMapper.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/mapper/ProjectGroupMapper.java
index beb4168..6fc5c18 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/mapper/ProjectGroupMapper.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/mapper/ProjectGroupMapper.java
@@ -1,12 +1,8 @@
 package cn.edu.hfut.rmdjzz.projectmanagement.mapper;
 
 import cn.edu.hfut.rmdjzz.projectmanagement.entity.ProjectGroup;
-import cn.edu.hfut.rmdjzz.projectmanagement.entity.ProjectType;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import java.util.List;
-
 /**
  * @author 张韬
  * created at 2022/6/30 21:34
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/mapper/ProjectMapper.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/mapper/ProjectMapper.java
index 2457e2b..bb495d8 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/mapper/ProjectMapper.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/mapper/ProjectMapper.java
@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Result;
-import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
 
 /**