修改接口

src/main/java/org/rcisoft/business/bdiscuss/dao/BDiscussRepository.java

@@ -30,10 +30,16 @@ public interface BDiscussRepository extends BaseMapper<BDiscuss> {
 
     @Select("<script> SELECT " +
             " bd.*, " +
-            " su.NAME AS studentName  " +
+            " su.NAME AS studentName,  " +
+            " pbd.student_id AS replyToId,  " +
+            " psu.NAME AS replyToName  " +
             "FROM " +
             " b_discuss bd " +
             " LEFT JOIN s_user su ON su.business_id = bd.student_id  " +
+            " LEFT JOIN b_discuss pbd ON bd.pid = pbd.business_id  " +
+            " AND pbd.del_flag = '0'  " +
+            " AND pbd.flag = '1' " +
+            " LEFT JOIN s_user psu ON psu.business_id = pbd.student_id  " +
             "WHERE " +
             " 1 = 1  " +
             " AND bd.del_flag = '0'  " +

src/main/java/org/rcisoft/business/bdiscuss/dto/BDiscussDto.java

@@ -20,5 +20,11 @@ public class BDiscussDto extends BDiscuss {
 
      private String studentName;
 
+     private String headPic;
+
+     private String replyToId;
+
+     private String replyToName;
+
 }
 

src/main/java/org/rcisoft/business/bdiscuss/entity/BDiscuss.java

@@ -31,6 +31,8 @@ public class BDiscuss  extends IdEntity<BDiscuss> {
 
      private String studentId;
 
+     private String isReply;
+
 
 }
 

src/main/java/org/rcisoft/business/bdiscuss/service/impl/BDiscussServiceImpl.java

 package org.rcisoft.business.bdiscuss.service.impl;
 
 import org.rcisoft.business.bdiscuss.dto.BDiscussDto;
+import org.rcisoft.common.util.feignDto.MTUserGetsReqDTO;
+import org.rcisoft.common.util.feignDto.MTUserInfoRspDTO;
+import org.rcisoft.common.util.outClient.MTCotactApiRequestClient;
 import org.rcisoft.core.util.UserUtil;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
@@ -16,6 +19,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 
@@ -30,6 +34,8 @@ public class BDiscussServiceImpl implements BDiscussService {
     @Autowired
     private BDiscussRepository bDiscussRepository;
 
+    @Autowired
+    MTCotactApiRequestClient mtCotactApiRequestClient;
 
     /**
     * 保存 bDiscuss
@@ -103,10 +109,30 @@ public class BDiscussServiceImpl implements BDiscussService {
     @Override
     public List<BDiscussDto> getDiscussByLessonId(String lessonId,String corpId) {
 
+        List<String> ids = new ArrayList<>();
+
         List<BDiscussDto> bDiscussList = bDiscussRepository.getDiscussByLessonId(lessonId,"",corpId);
         bDiscussList.stream().forEach(bDiscuss -> {
             bDiscuss.setBDiscussChildList(bDiscussRepository.getDiscussByLessonId(lessonId,bDiscuss.getBusinessId(),corpId));
+            ids.add(bDiscuss.getStudentId());
+        });
+
+        MTUserGetsReqDTO mtUserGetsReqDTO = new MTUserGetsReqDTO();
+        mtUserGetsReqDTO.setCorpId(corpId);
+        mtUserGetsReqDTO.setIds(ids);
+        List<MTUserInfoRspDTO> mtUserInfoRspDTOList = mtCotactApiRequestClient.userGets(mtUserGetsReqDTO);
+        if (mtUserInfoRspDTOList != null && mtUserInfoRspDTOList.size() > 0){
+            mtUserInfoRspDTOList.forEach(mtUserInfoRspDTO -> {
+                bDiscussList.forEach(bDiscussDto -> {
+                    if (mtUserInfoRspDTO.getId().equals(bDiscussDto.getStudentId())) {
+                        //设置一级评论头像
+//                        myInfoDTO.setName(mtUserInfoRspDTO.getName());
+                        bDiscussDto.setHeadPic(mtUserInfoRspDTO.getAvatar());
+                    }
+                });
             });
+        }
+
         return bDiscussList;
     }
 

src/main/java/org/rcisoft/business/blesson/entity/BLesson.java

@@ -246,6 +246,7 @@ public class BLesson extends IdEntity<BLesson> {
     private String lecturerDeptName;
 
     @ApiModelProperty(value = "登录人是否为讲师0 不是 1 是")
+    @Transient
     private String userIsLecturer;
 
 

src/main/resources/mapper/business/bdiscuss/mapper/BDiscussMapper.xml

@@ -15,6 +15,7 @@
             <result column="content" jdbcType="LONGVARCHAR" property="content"/>
             <result column="level" jdbcType="VARCHAR" property="level"/>
             <result column="student_id" jdbcType="VARCHAR" property="studentId"/>
+            <result column="is_reply" jdbcType="VARCHAR" property="isReply"/>
     </resultMap>
 
         <resultMap id="BaseResultMapDto" type="org.rcisoft.business.bdiscuss.dto.BDiscussDto">
@@ -31,6 +32,7 @@
                 <result column="content" jdbcType="LONGVARCHAR" property="content"/>
                 <result column="level" jdbcType="VARCHAR" property="level"/>
                 <result column="student_id" jdbcType="VARCHAR" property="studentId"/>
+                <result column="is_reply" jdbcType="VARCHAR" property="isReply"/>
         </resultMap>
 
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->