|
@@ -113,7 +113,7 @@ public class ScoreServiceImpl extends ServiceImpl<ScoreMapper, Score> implements
|
|
public HttpRespMsg getDetailByTimeAndUid(Score score,String time) {
|
|
public HttpRespMsg getDetailByTimeAndUid(Score score,String time) {
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
ScoreVO vo = new ScoreVO();
|
|
ScoreVO vo = new ScoreVO();
|
|
- Score oldScore = scoreMapper.selectOne(new QueryWrapper<Score>().eq("scoring_year_month",time));
|
|
|
|
|
|
+ Score oldScore = scoreMapper.selectOne(new QueryWrapper<Score>().eq("scoring_year_month",time).eq("uid",score.getUid()));
|
|
if(oldScore != null){
|
|
if(oldScore != null){
|
|
BeanUtils.copyProperties(oldScore,vo);
|
|
BeanUtils.copyProperties(oldScore,vo);
|
|
Idea idea = new Idea();
|
|
Idea idea = new Idea();
|
|
@@ -124,8 +124,8 @@ public class ScoreServiceImpl extends ServiceImpl<ScoreMapper, Score> implements
|
|
double sum = ideaVos.stream().filter(x -> x.getScore() != null).mapToDouble(Idea::getScore).sum();
|
|
double sum = ideaVos.stream().filter(x -> x.getScore() != null).mapToDouble(Idea::getScore).sum();
|
|
vo.setIdeaScoreSum(sum);
|
|
vo.setIdeaScoreSum(sum);
|
|
}
|
|
}
|
|
- msg.data = vo;
|
|
|
|
}
|
|
}
|
|
|
|
+ msg.data = vo;
|
|
return msg;
|
|
return msg;
|
|
}
|
|
}
|
|
|
|
|