Merge branch 'pt' of gitee.com:ccsens_s/ccsenscloud into pt

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")

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);
 }

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);
 }

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);
+    }
 }

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的信息
      */

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>