|
|
@ -96,7 +96,7 @@ public class EvaluationServiceImpl implements EvaluationService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 将树的节点的 id 进行替换
|
|
|
|
* 将树的节点的 id 进行替换(天才)
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
private void refreshAppraiseTree(List<AppraiseTreeNode> nodes) {
|
|
|
|
private void refreshAppraiseTree(List<AppraiseTreeNode> nodes) {
|
|
|
|
List<AppraiseTreeNode> children = nodes.stream().filter(item -> item.getPid() != null).collect(Collectors.toList());
|
|
|
|
List<AppraiseTreeNode> children = nodes.stream().filter(item -> item.getPid() != null).collect(Collectors.toList());
|
|
|
@ -308,10 +308,10 @@ public class EvaluationServiceImpl implements EvaluationService {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<AppraiseRecordItem> findVoteRecord(FindVoteRecordDto findVoteRecordDto) {
|
|
|
|
public List<AppraiseRecordItem> findVoteRecord(FindVoteRecordDto findVoteRecordDto) {
|
|
|
|
String periodId = findVoteRecordDto.getTargetId();
|
|
|
|
String periodId = findVoteRecordDto.getPeriodId();
|
|
|
|
String targetId = findVoteRecordDto.getTargetId();
|
|
|
|
String targetId = StringUtils.isBlank(findVoteRecordDto.getTargetId()) ? null : findVoteRecordDto.getTargetId();
|
|
|
|
String targetType = findVoteRecordDto.getTargetType();
|
|
|
|
String targetType = StringUtils.isBlank(findVoteRecordDto.getTargetType()) ? null : findVoteRecordDto.getTargetType();
|
|
|
|
String classId = findVoteRecordDto.getClassId();
|
|
|
|
String classId = StringUtils.isBlank(findVoteRecordDto.getClassId()) ? null : findVoteRecordDto.getClassId();
|
|
|
|
User loginUser = SecurityUtil.getLoginUser();
|
|
|
|
User loginUser = SecurityUtil.getLoginUser();
|
|
|
|
String teacherId = loginUser.getId();
|
|
|
|
String teacherId = loginUser.getId();
|
|
|
|
String schoolId = loginUser.getSchoolId();
|
|
|
|
String schoolId = loginUser.getSchoolId();
|
|
|
|