From b23b243473fc9ab20ca62eebf3668c143e2e7d23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 15:30:53 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/EvaluateStudentServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/EvaluateStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/EvaluateStudentServiceImpl.java
index 58f2acc..1fe325d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/EvaluateStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/EvaluateStudentServiceImpl.java
@@ -2,12 +2,17 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.account.entity.Coach;
import com.dsh.account.entity.EvaluateStudent;
import com.dsh.account.entity.TStudent;
+import com.dsh.account.entity.User;
+import com.dsh.account.feignclient.other.SiteClient;
import com.dsh.account.mapper.EvaluateStudentMapper;
import com.dsh.account.mapper.TStudentMapper;
import com.dsh.account.model.vo.commentDetail.StuCommentsVo;
+import com.dsh.account.service.CoachService;
import com.dsh.account.service.EvaluateStudentService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -32,18 +37,31 @@
private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+ @Autowired
+ private CoachService coachService;
+ @Resource
+ private SiteClient siteClient;
@Override
public List<StuCommentsVo> queryStuCommentsList(Integer stuId) {
List<StuCommentsVo> stuCommentsVos = new ArrayList<>();
TStudent tStudent = tstuMapper.selectById(stuId);
List<EvaluateStudent> evaluateStudents = this.list(new QueryWrapper<EvaluateStudent>()
.eq("studentId",stuId ));
+
+
if (evaluateStudents.size() > 0){
for (EvaluateStudent evaluateStudent : evaluateStudents) {
StuCommentsVo vo = new StuCommentsVo();
- vo.setHeadImg(tStudent.getHeadImg());
- vo.setStuName(tStudent.getName());
- vo.setComTime(format.format(tStudent.getInsertTime()));
+
+// Coach coach = coachService.getById(evaluateStudent.getCoachId());
+ User user = siteClient.queryUserName(evaluateStudent.getCoachId());
+
+// vo.setHeadImg(tStudent.getHeadImg());
+ vo.setHeadImg(user.getAvatar());
+// vo.setStuName(tStudent.getName());
+ vo.setStuName(user.getName());
+ vo.setComTime(format.format(evaluateStudent.getInsertTime()));
vo.setContents(evaluateStudent.getContent());
String imgs = evaluateStudent.getImgs();
String[] split = imgs.split(",");
--
Gitblit v1.7.1