update
This commit is contained in:
parent
bb6f24a30b
commit
f602b39b64
|
@ -43,7 +43,7 @@ public class ConferenceAttachmentWrapper extends BaseWrapper<ConferenceAttachmen
|
|||
dto.setVoteList(voteList);
|
||||
|
||||
//打分结束算平均分
|
||||
if (null != dto.getScoreState() && 2 == dto.getScoreState()) {
|
||||
// if (null != dto.getScoreState() && 2 == dto.getScoreState()) {
|
||||
//没打分的不算
|
||||
List<ConferenceAttachmentScore> scoredList = scoreList.stream().filter(item -> item.getScore() != null).collect(Collectors.toList());
|
||||
if (CollectionUtil.isNotEmpty(scoredList)) {
|
||||
|
@ -54,9 +54,9 @@ public class ConferenceAttachmentWrapper extends BaseWrapper<ConferenceAttachmen
|
|||
} else {
|
||||
dto.setAverageScore(new BigDecimal("0"));
|
||||
}
|
||||
}
|
||||
// }
|
||||
|
||||
if (null != dto.getVoteState() && 2 == dto.getVoteState()) {
|
||||
// if (null != dto.getVoteState() && 2 == dto.getVoteState()) {
|
||||
//没投的不算
|
||||
List<ConferenceAttachmentVote> agreeList = voteList.stream().filter(item -> item.getVote() == 1).collect(Collectors.toList());
|
||||
List<ConferenceAttachmentVote> refuseList = voteList.stream().filter(item -> item.getVote() == 2).collect(Collectors.toList());
|
||||
|
@ -64,7 +64,7 @@ public class ConferenceAttachmentWrapper extends BaseWrapper<ConferenceAttachmen
|
|||
dto.setAgreeVoteCount(agreeList.size());
|
||||
dto.setRefuseVoteCount(refuseList.size());
|
||||
dto.setAbandonVoteCount(abandonList.size());
|
||||
}
|
||||
// }
|
||||
|
||||
dto.setIsVoteUser(false);
|
||||
dto.setIsVoted(false);
|
||||
|
|
Loading…
Reference in New Issue