zhc077
/
hnjd_comp
forked from wangjiadong/comp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

学校综合报告 7.29

Browse Source
main
zhc077 4 months ago
parent 0ae957c41c
commit 112b09b2ea
1 changed files with 2 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java

3
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/homepage/service/UserHomePageServiceImpl.java
Unescape View File

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

Write Preview
Loading…
Cancel
Save