From ad9544111c48d8213344cbf996c6b48c29eb97a3 Mon Sep 17 00:00:00 2001
From: ArgonarioD <arnordorian@sina.com>
Date: Thu, 7 Jul 2022 15:43:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86Task=E4=BB=8E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=BB=E5=87=BAjson=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E5=BA=8F=E5=88=97=E5=8C=96=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86swagger=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E6=AF=94=E8=BE=83=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?staff=E5=9C=A8=E9=A1=B9=E7=9B=AE=E4=B8=AD=E7=9A=84=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=AD=89=E7=BA=A7=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectmanagement/service/IProjectGroupService.java     | 2 ++
 .../service/impl/ProjectGroupServiceImpl.java               | 5 +++++
 src/main/resources/application.yml                          | 4 +++-
 src/main/resources/mapper/TaskMapper.xml                    | 6 +++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IProjectGroupService.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IProjectGroupService.java
index 111c09a..709191b 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IProjectGroupService.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IProjectGroupService.java
@@ -26,6 +26,8 @@ public interface IProjectGroupService extends IService<ProjectGroup> {
 
     Integer getProjectAccessLevel(Integer staffId, Integer projectId);
 
+    Integer compareProjectAccessLevel(Integer projectId, Integer staffId1, Integer staffId2);
+
     List<Integer> findAllProjectNumber(String token, Integer projectId) throws BadRequestException;
 
     /**
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectGroupServiceImpl.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectGroupServiceImpl.java
index e1c6d36..4cf6690 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectGroupServiceImpl.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectGroupServiceImpl.java
@@ -111,6 +111,11 @@ public class ProjectGroupServiceImpl extends ServiceImpl<ProjectGroupMapper, Pro
         }
     }
 
+    @Override
+    public Integer compareProjectAccessLevel(Integer projectId, Integer staffId1, Integer staffId2) {
+        return Integer.compare(getProjectAccessLevel(staffId1, projectId), getProjectAccessLevel(staffId2, projectId));
+    }
+
     @Override
     public List<Integer> findAllProjectNumber(String token, Integer projectId) throws BadRequestException {
         List<Integer> res = new ArrayList<>();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fbf947a..8204db5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -31,4 +31,6 @@ server:
       enabled: true
   forward-headers-strategy: framework
 springdoc:
-  packages-to-scan: cn.edu.hfut.rmdjzz.projectmanagement
\ No newline at end of file
+  packages-to-scan: cn.edu.hfut.rmdjzz.projectmanagement
+  swagger-ui:
+    display-operation-id: true
\ No newline at end of file
diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml
index c1587d9..8becc7a 100644
--- a/src/main/resources/mapper/TaskMapper.xml
+++ b/src/main/resources/mapper/TaskMapper.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.edu.hfut.rmdjzz.projectmanagement.mapper.TaskMapper">
-    <select id="selectSubTaskList" resultType="cn.edu.hfut.rmdjzz.projectmanagement.entity.dto.TaskDto">
+    <resultMap id="taskDto" type="cn.edu.hfut.rmdjzz.projectmanagement.entity.dto.TaskDto">
+        <id property="taskId" column="task_id"/>
+        <result property="attachedInfo" column="attached_info" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+    </resultMap>
+    <select id="selectSubTaskList" resultMap="taskDto">
         SELECT task_id,
                task_name,
                task_project_id,