From 0677f9a81d258964782a8ebad5b2a3caf078e463 Mon Sep 17 00:00:00 2001
From: "yang.yongquan" <3395816735@qq.com>
Date: Thu, 30 Jun 2022 21:39:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86project=5Fman=5Fmont?=
 =?UTF-8?q?h=E7=9A=84=E6=98=A0=E5=B0=84=20=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/edu/hfut/rmdjzz/projectmanagement/entity/Project.java  | 2 ++
 .../hfut/rmdjzz/projectmanagement/entity/ResultProject.java   | 1 +
 .../hfut/rmdjzz/projectmanagement/mapper/ProjectMapper.java   | 4 +++-
 .../projectmanagement/service/impl/ProjectServiceImpl.java    | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Project.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Project.java
index 3deb310..5d8cc88 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Project.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Project.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.apache.poi.hpsf.Decimal;
 
 import java.time.LocalDate;
 
@@ -38,4 +39,5 @@ public class Project {
     @TableLogic
     private Boolean isDeleted;
     private Integer projectCreator;
+    private Decimal projectManMonth;
 }
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/ResultProject.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/ResultProject.java
index b6bf32f..5b26095 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/ResultProject.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/ResultProject.java
@@ -17,6 +17,7 @@ import java.time.LocalDate;
 public class ResultProject {
     Integer projectId;
     String projectName;
+    Integer projectCreator;
     Long contractAmount;
     String projectImportance;
     String projectClassName;
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 6845739..5cdf9eb 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
@@ -30,6 +30,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
                     project_name,
                     contract_amount,
                     project_importance,
+                    project_creator,
                     pt1.project_class_name as project_class_name,
                     pt2.project_class_name as project_subclass_name,
                     is_completed,
@@ -50,7 +51,8 @@ public interface ProjectMapper extends BaseMapper<Project> {
             @Result(column = "project_class_name", property = "projectClassName"),
             @Result(column = "is_completed", property = "IsCompleted"),
             @Result(column = "is_deleted", property = "IsDeleted"),
-            @Result(column = "project_close_time", property = "projectCloseTime")
+            @Result(column = "project_close_time", property = "projectCloseTime"),
+            @Result(column = "project_creator", property = "projectCreator")
     })
     IPage<ResultProject> findMyProject(IPage<ResultProject> pg, @Param("id") Integer staff_id, @Param(Constants.WRAPPER) Wrapper<Project> wrapper);
 }
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectServiceImpl.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectServiceImpl.java
index eb46a9d..f68d09b 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectServiceImpl.java
@@ -40,7 +40,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             Integer pageSize,
             Map<String, Object> params
     ) throws TokenException {
-        Integer staffId = 2;
+        Integer staffId = TokenUtils.getStaffId(token);
         IPage<ResultProject> page = new Page<>(pageCurrent, pageSize);
         IPage<ResultProject> userPage = baseMapper.findMyProject(page, staffId, WrapperUtils.allEqAndTimeIntervalQueryWrapper(params, false));
         return (Page<ResultProject>) userPage;