|
|
|
@ -496,7 +496,7 @@ public class UserHomePageServiceImpl implements UserHomePageService { |
|
|
|
|
Optional.ofNullable(awardPersionList).orElse(new LinkedList<>()).stream().forEach(p -> { |
|
|
|
|
ReportCompVo compVo = new ReportCompVo(); |
|
|
|
|
compVo.setStuName(p.getStudentname()); |
|
|
|
|
// BeanUtils.copyProperties(p, compVo);
|
|
|
|
|
compVo.setAwardName(p.getAwardname()); |
|
|
|
|
AnnualCompPoint point = iAnnualCompPointService.getById(p.getAnnualCompP()); |
|
|
|
|
if (!ObjectUtils.isEmpty(point)) { |
|
|
|
|
compVo.setPointName(point.getObjName()); |
|
|
|
@ -740,6 +740,7 @@ public class UserHomePageServiceImpl implements UserHomePageService { |
|
|
|
|
Optional.ofNullable(awardPersionList).orElse(new LinkedList<>()).stream().forEach(p -> { |
|
|
|
|
ReportCompVo compVo = new ReportCompVo(); |
|
|
|
|
compVo.setStuName(p.getStudentname()); |
|
|
|
|
compVo.setAwardName(p.getAwardname()); |
|
|
|
|
AnnualCompPoint point = iAnnualCompPointService.getById(p.getAnnualCompP()); |
|
|
|
|
if (!ObjectUtils.isEmpty(point)) { |
|
|
|
|
compVo.setPointName(point.getObjName()); |
|
|
|
|