From 3b0458dd4cfdb9f94e0712d3417053594416cfe1 Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Wed, 19 Aug 2020 16:33:22 +0800
Subject: [PATCH] =?UTF-8?q?'=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/tall/config/SpringConfig.java  |  1 +
 .../ccsens/tall/persist/dao/ProMemberDao.java |  8 ++++++
 .../tall/service/IProMemberService.java       |  8 ++++++
 .../ccsens/tall/service/ProMemberService.java |  5 ++++
 .../com/ccsens/tall/web/UserController.java   | 12 +++++++++
 tall/src/main/resources/application.yml       |  4 +--
 .../resources/mapper_dao/ProMemberDao.xml     | 26 +++++++++++++++++++
 7 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java
index 93559974..097b2ea3 100644
--- a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java
+++ b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java
@@ -142,6 +142,7 @@ public class SpringConfig implements WebMvcConfigurer {
                     .excludePathPatterns("/users/token")
                     .excludePathPatterns("/users/claims")
                     .excludePathPatterns("/users/member")
+                    .excludePathPatterns("/users/memberByTask")
                     .excludePathPatterns("/users/allMemberAll")
                     .excludePathPatterns("/users/userId")
                     .excludePathPatterns("/users/mergeUserId")
diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberDao.java
index 397daf10..4c5c134e 100644
--- a/tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberDao.java
+++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberDao.java
@@ -33,4 +33,12 @@ public interface ProMemberDao extends ProMemberMapper{
     ProjectVo.MembersByProject getMemberInfoByMemberId(@Param("memberId")Long memberId);
 
     List<ProjectVo.AttentionInfo> queryAttention(@Param("projectId")Long projectId);
+
+    /**
+     * 根据用户ID和任务ID查询用户信息
+     * @param userId 用户ID
+     * @param taskId 任务ID
+     * @return 用户信息
+     */
+    MemberVo.MemberInfo getMemberByUserIdAndTaskId(@Param("userId") Long userId, @Param("taskId")Long taskId);
 }
diff --git a/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java
index 6e2462d3..cbf5c8a6 100644
--- a/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java
@@ -61,4 +61,12 @@ public interface IProMemberService {
      * @return 返回关注者的信息
      */
     List<ProjectVo.AttentionInfo> queryAttention(ProjectDto.ProjectIdDto projectDto);
+
+    /**
+     * 根据用户id和任務id查询用户信息
+     * @param userId 用户ID
+     * @param taskId 任务ID
+     * @return 用户信息
+     */
+    MemberVo.MemberInfo getMemberByUserIdAndTaskId(Long userId, Long taskId);
 }
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
index 1191f7e4..4c4f00da 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
@@ -414,4 +414,9 @@ public class ProMemberService implements IProMemberService {
     public List<ProjectVo.AttentionInfo> queryAttention(ProjectDto.ProjectIdDto projectDto) {
         return proMemberDao.queryAttention(projectDto.getProjectId());
     }
+
+    @Override
+    public MemberVo.MemberInfo getMemberByUserIdAndTaskId(Long userId, Long taskId) {
+        return proMemberDao.getMemberByUserIdAndTaskId(userId, taskId);
+    }
 }
diff --git a/tall/src/main/java/com/ccsens/tall/web/UserController.java b/tall/src/main/java/com/ccsens/tall/web/UserController.java
index 6f4e6a18..a6310460 100644
--- a/tall/src/main/java/com/ccsens/tall/web/UserController.java
+++ b/tall/src/main/java/com/ccsens/tall/web/UserController.java
@@ -427,6 +427,18 @@ public class UserController {
         return JsonResponse.newInstance().ok(memberInfo);
     }
 
+
+    /**
+     * 查询user在项目中的member信息
+     */
+    @RequestMapping(value = "memberByTask", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<MemberVo.MemberInfo> getMemberByUserIdAndTaskId( Long userId,Long taskId) throws Exception {
+        log.info("根据任务ID和用户ID查询用户信息：{}-{}", userId, taskId);
+        MemberVo.MemberInfo memberInfo = proMemberService.getMemberByUserIdAndTaskId(userId,taskId);
+        log.info("用户信息:{}", memberInfo);
+        return JsonResponse.newInstance().ok(memberInfo);
+    }
+
     /**
      * 查询user的信息
      */
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index b2acd365..c88e995d 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: test
+    include: util-test,common
diff --git a/tall/src/main/resources/mapper_dao/ProMemberDao.xml b/tall/src/main/resources/mapper_dao/ProMemberDao.xml
index 9dc09324..ac2771e7 100644
--- a/tall/src/main/resources/mapper_dao/ProMemberDao.xml
+++ b/tall/src/main/resources/mapper_dao/ProMemberDao.xml
@@ -272,5 +272,31 @@
         and t.mId is null
         GROUP BY a.id
     </select>
+    <select id="getMemberByUserIdAndTaskId" resultType="com.ccsens.tall.bean.vo.MemberVo$MemberInfo">
+        SELECT
+            m.id AS id,
+            m.user_id AS userId,
+            m.project_id AS projectId,
+            m.nickname AS nickname,
+            m.avatar_url AS avatarUrl,
+            m.NO AS NO,
+            m.phone AS phone,
+            m.description AS description,
+            m.join_time AS joinTime,
+            m.stakeholder_id AS stakeholderId
+        FROM
+            t_pro_task_sub_time t,
+            t_pro_task_detail d,
+            t_pro_member m
+        WHERE
+            t.task_detail_id = d.id
+            AND d.project_id = m.project_id
+            AND t.id = #{taskId}
+            AND m.user_id = #{userId}
+            AND t.rec_status = 0
+            AND d.rec_status = 0
+            AND m.rec_status = 0
+        limit 1
+    </select>
 
 </mapper>
\ No newline at end of file