From 20c51f1ca55292142dd451211a4e34e0443805ff Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 7 Dec 2023 10:32:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=84=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AnnualCompPointController.java | 171 ++++++++++-------- .../controller/AnnualCompGroupController.java | 32 ++++ .../controller/ExpScoreController.java | 4 + .../demo/expscore/entity/ExpScore.java | 9 +- .../controller/ScorePersionController.java | 33 ++++ 5 files changed, 165 insertions(+), 84 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java index 6288e185..eeec0da3 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/controller/AnnualCompPointController.java @@ -557,22 +557,25 @@ public class AnnualCompPointController extends JeecgController queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code",listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion.setStudentname(sysUser.getRealname()); - awardPersion.setStudentcode(sysUser.getUsername()); - awardPersionService.save(awardPersion1); + if(j queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code",listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion1.setStudentname(sysUser.getRealname()); + awardPersion1.setStudentcode(sysUser.getUsername()); + awardPersionService.save(awardPersion1); + } + } } if(list.get(i).getIsSecondPrize().equals("Y")){ @@ -580,22 +583,24 @@ public class AnnualCompPointController extends JeecgController queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code",listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion.setStudentname(sysUser.getRealname()); - awardPersion.setStudentcode(sysUser.getUsername()); - awardPersionService.save(awardPersion1); + if(j queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion1.setStudentname(sysUser.getRealname()); + awardPersion1.setStudentcode(sysUser.getUsername()); + awardPersionService.save(awardPersion1); + } } } if(list.get(i).getIsThirdPrize().equals("Y")){ @@ -604,22 +609,24 @@ public class AnnualCompPointController extends JeecgController queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code",listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion.setStudentname(sysUser.getRealname()); - awardPersion.setStudentcode(sysUser.getUsername()); - awardPersionService.save(awardPersion1); + if(j queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion1.setStudentname(sysUser.getRealname()); + awardPersion1.setStudentcode(sysUser.getUsername()); + awardPersionService.save(awardPersion1); + } } } if(list.get(i).getIsFourthPrize().equals("Y")){ @@ -629,22 +636,24 @@ public class AnnualCompPointController extends JeecgController queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code",listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion.setStudentname(sysUser.getRealname()); - awardPersion.setStudentcode(sysUser.getUsername()); - awardPersionService.save(awardPersion1); + if(j queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion1.setStudentname(sysUser.getRealname()); + awardPersion1.setStudentcode(sysUser.getUsername()); + awardPersionService.save(awardPersion1); + } } } if(list.get(i).getIsFifthPrize().equals("Y")){ @@ -655,22 +664,24 @@ public class AnnualCompPointController extends JeecgController queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); - queryWrappertm.eq("enroll_code",listsp.get(j).getEnrollCode()); - List listtm = teamManagementService.list(queryWrappertm); - SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); - awardPersion.setStudentname(sysUser.getRealname()); - awardPersion.setStudentcode(sysUser.getUsername()); - awardPersionService.save(awardPersion1); + if(j queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap()); + queryWrappertm.eq("enroll_code", listsp.get(j).getEnrollCode()); + List listtm = teamManagementService.list(queryWrappertm); + SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId()); + awardPersion1.setStudentname(sysUser.getRealname()); + awardPersion1.setStudentcode(sysUser.getUsername()); + awardPersionService.save(awardPersion1); + } } } annualCompPoint.setIsPj(1); diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java index 84f7133b..f7f60b01 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompgroup/controller/AnnualCompGroupController.java @@ -15,6 +15,10 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; +import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService; +import org.jeecg.modules.demo.annualcomp.entity.AnnualComp; +import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService; import org.jeecg.modules.demo.annualcompgroup.entity.AnnualCompGroup; import org.jeecg.modules.demo.annualcompgroup.service.IAnnualCompGroupService; @@ -23,6 +27,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.demo.awardpersion.entity.AwardPersion; import org.jeecg.modules.demo.comp.entity.Comp; import org.jeecg.modules.demo.comp.service.ICompService; import org.jeecg.modules.demo.scoresta.entity.ScoreSta; @@ -64,6 +69,12 @@ public class AnnualCompGroupController extends JeecgController queryWrappercomp = QueryGenerator.initQueryWrapper(comp, req.getParameterMap()); + queryWrappercomp.like("comp_admin",user.getUsername()); + List list = compService.list(queryWrappercomp); + List ids = list.stream().map(Comp::getId).collect(Collectors.toList()); + QueryWrapper queryWrapperAnnual = new QueryWrapper<>(); + queryWrapperAnnual.in(ids.size()!=0,"compid",ids); + List listAnnual = annualCompService.list(queryWrapperAnnual); + List annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList()); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(annualCompGroup, req.getParameterMap()); + queryWrapper.in(annualIds.size()!=0,"annal_comp",annualIds); + + AnnualCompPoint annualCompPoint = new AnnualCompPoint(); + QueryWrapper queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); + queryWrapperacp.in(annualIds.size()!=0,"annual_comp_id",annualIds); + queryWrapperacp.eq("annual_comp_switch","Y"); // 比赛必须是开启的 + List listacp = annualCompPointService.list(queryWrapperacp); + List acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList()); + queryWrapper.in(acpIds.size()!=0,"ann_comp_p",acpIds); + + Page page = new Page(pageNo, pageSize); IPage pageList = annualCompGroupService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java index 6ab637bb..f2dc8d4d 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/controller/ExpScoreController.java @@ -144,6 +144,10 @@ public class ExpScoreController extends JeecgController page = new Page(pageNo, pageSize); IPage pageList = expScoreService.page(page, queryWrapper); + for (int k = 0 ; k < pageList.getRecords().size();k++){ + pageList.getRecords().get(k).setFile(upfilePersionService.getById(pageList.getRecords().get(k).getUpfilePersionId()).getUrl()); + } + return Result.OK(pageList); } diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/entity/ExpScore.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/entity/ExpScore.java index 925fc71f..15f7e1c7 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/entity/ExpScore.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expscore/entity/ExpScore.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -84,6 +82,9 @@ public class ExpScore implements Serializable { @Dict(dictTable = "upfile_persion", dicText = "topic_name", dicCode = "id") @ApiModelProperty(value = "作品") private java.lang.String upfilePersionId; + /**作品文件*/ + @TableField(exist = false) + private java.lang.String file; /**评分标准id*/ @Excel(name = "评分标准id", width = 15) @ApiModelProperty(value = "评分标准id") diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/scorepersion/controller/ScorePersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/scorepersion/controller/ScorePersionController.java index c01a3ea4..8b1fe80e 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/scorepersion/controller/ScorePersionController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/scorepersion/controller/ScorePersionController.java @@ -21,12 +21,17 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService; +import org.jeecg.modules.demo.annualcomp.entity.AnnualComp; +import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService; import org.jeecg.modules.demo.annualcompaward.entity.AnnualCompAward; import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.AnnualCompetitionProjectRegistration; import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.IAnnualCompetitionProjectRegistrationService; +import org.jeecg.modules.demo.annualcompgroup.entity.AnnualCompGroup; import org.jeecg.modules.demo.awardpersion.entity.AwardPersion; import org.jeecg.modules.demo.awardpersion.entity.AwardPersionMb; import org.jeecg.modules.demo.awardpersion.service.IAwardPersionService; +import org.jeecg.modules.demo.comp.entity.Comp; +import org.jeecg.modules.demo.comp.service.ICompService; import org.jeecg.modules.demo.scorepersion.entity.ScorePersion; import org.jeecg.modules.demo.scorepersion.entity.ScorePersionMb; import org.jeecg.modules.demo.scorepersion.service.IScorePersionService; @@ -72,6 +77,13 @@ public class ScorePersionController extends JeecgController queryWrappercomp = QueryGenerator.initQueryWrapper(comp, req.getParameterMap()); + queryWrappercomp.like("comp_admin",user.getUsername()); + List list = compService.list(queryWrappercomp); + List ids = list.stream().map(Comp::getId).collect(Collectors.toList()); + QueryWrapper queryWrapperAnnual = new QueryWrapper<>(); + queryWrapperAnnual.in(ids.size()!=0,"compid",ids); + List listAnnual = annualCompService.list(queryWrapperAnnual); + List annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList()); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(scorePersion, req.getParameterMap()); + queryWrapper.in(annualIds.size()!=0,"annual_compid",annualIds); + + AnnualCompPoint annualCompPoint = new AnnualCompPoint(); + QueryWrapper queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); + queryWrapperacp.in(annualIds.size()!=0,"annual_comp_id",annualIds); + queryWrapperacp.eq("annual_comp_switch","Y"); // 比赛必须是开启的 + List listacp = annualCompPointService.list(queryWrapperacp); + List acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList()); + queryWrapper.in(acpIds.size()!=0,"annual_comp_p",acpIds); + + Page page = new Page(pageNo, pageSize); IPage pageList = scorePersionService.page(page, queryWrapper); return Result.OK(pageList); From af05ca57ef88f3ebc4ac484cc3ab1d6f0b7a3f85 Mon Sep 17 00:00:00 2001 From: Gitea Date: Thu, 7 Dec 2023 10:33:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=84=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecgboot-vue3-master/src/views/expscore/ExpScore.data.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jeecgboot-vue3-master/src/views/expscore/ExpScore.data.ts b/jeecgboot-vue3-master/src/views/expscore/ExpScore.data.ts index 659df3d9..20127167 100644 --- a/jeecgboot-vue3-master/src/views/expscore/ExpScore.data.ts +++ b/jeecgboot-vue3-master/src/views/expscore/ExpScore.data.ts @@ -34,6 +34,12 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'upfilePersionId_dictText' }, + { + title: '作品文件', + align: "center", + dataIndex: 'file', + slots: { customRender: 'fileSlot' }, + }, { title: '成绩', align: "center", From fe0e4e41b2b8afe0601cb588eb9ed16658111877 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Thu, 7 Dec 2023 17:32:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=AF=94=E8=B5=9B=E5=A4=A7=E5=B1=8F-?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=B8=AA=E4=BA=BA=E3=80=81=E9=99=A2=E7=B3=BB?= =?UTF-8?q?=E7=BB=BC=E5=90=88=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=2012.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/common/util/DateUtils.java | 6 ++-- .../CompSystemBigScreenServiceImpl.java | 31 ++++++++++++++++--- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java b/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java index 55273f58..28ca271b 100644 --- a/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java +++ b/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java @@ -780,12 +780,12 @@ public class DateUtils extends PropertyEditorSupport { * @author: z.h.c * @date: 23/11/30 15:38 */ - public static List getLast4Year() { + public static List getLastxYear(int lastYear) { Calendar calendar = Calendar.getInstance(); // 创建Calendar对象并初始化为当前时间 int currentYear = calendar.get(Calendar.YEAR); List years = new LinkedList<>(); years.add(currentYear); - for (int i = 0; i < 4; i++) { + for (int i = 0; i < lastYear-1; i++) { calendar.add(Calendar.YEAR, -1); // 将日期向前移动一年 int previousYear = calendar.get(Calendar.YEAR); // 获取上一年的年份 years.add(previousYear); @@ -795,7 +795,7 @@ public class DateUtils extends PropertyEditorSupport { public static void main(String[] args) { - List last4Year = getLast4Year(); + List last4Year = getLastxYear(1); last4Year.forEach(y->{ System.out.println(y); }); diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/service/CompSystemBigScreenServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/service/CompSystemBigScreenServiceImpl.java index 6f2b86ed..02c129c3 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/service/CompSystemBigScreenServiceImpl.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/service/CompSystemBigScreenServiceImpl.java @@ -11,7 +11,9 @@ import org.jeecg.modules.demo.annual.entity.Annual; import org.jeecg.modules.demo.annual.service.IAnnualService; import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService; +import org.jeecg.modules.demo.annualScore.entity.PersonalCompScore; import org.jeecg.modules.demo.annualScore.entity.PersonalCompTotalScore; +import org.jeecg.modules.demo.annualScore.service.IPersonalCompScoreService; import org.jeecg.modules.demo.annualScore.service.IPersonalCompTotalScoreService; import org.jeecg.modules.demo.annualcomp.entity.AnnualComp; import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService; @@ -75,6 +77,9 @@ public class CompSystemBigScreenServiceImpl implements CompSystemBigScreenServic @Autowired private IPersonalCompTotalScoreService iPersonalCompTotalScoreService; + @Autowired + private IPersonalCompScoreService iPersonalCompScoreService; + @Autowired private IDepartAbilityEvaluationService iDepartAbilityEvaluationService; @@ -118,19 +123,19 @@ public class CompSystemBigScreenServiceImpl implements CompSystemBigScreenServic compCounts.put("pointCount", pointCount); //总报名数数 Long count = iAnnualCompetitionProjectRegistrationService.count(); - //学生人数 Long personCount = iAnnualCompetitionProjectRegistrationService.count(new LambdaQueryWrapper() .eq(AnnualCompetitionProjectRegistration::getEntryFormat, "0")); + //学生人数 compCounts.put("personCompCount", personCount); - //队伍数 Long teamCount = count - personCount; + //队伍数 compCounts.put("teamCompCount", teamCount); resultMap.put("compCounts", compCounts); List departAbilityEvaluations = iDepartAbilityEvaluationService.list(); resultMap.put("departAbilityEvaluation", departAbilityEvaluations); - List years = DateUtils.getLast4Year(); + List years = DateUtils.getLastxYear(5); List annualList = iAnnualService.list(new LambdaQueryWrapper().in(Annual::getAnnualName, years).orderByAsc(Annual::getAnnualName)); List last5YearDataVos = new LinkedList<>(); Optional.ofNullable(annualList).orElse(new LinkedList<>()).stream().forEach(annual -> { @@ -182,8 +187,26 @@ public class CompSystemBigScreenServiceImpl implements CompSystemBigScreenServic AnnualCompPoint annualCompPoint = iAnnualCompPointService.getById(award.getAnnualCompP()); award.setAnnualCompPname(annualCompPoint.getObjName()); }); + studentInfoMap.put("awardList", awardPersions); - studentInfoMap.put("studentAwardList", awardPersions); + List> last4YearData = new LinkedList<>(); + List years = DateUtils.getLastxYear(4); + List annualList = iAnnualService.list(new LambdaQueryWrapper().in(Annual::getAnnualName, years).orderByAsc(Annual::getAnnualName)); + annualList.forEach(annual -> { + AtomicReference baseScore = new AtomicReference<>(BigDecimal.ZERO); + Map yearData = new LinkedHashMap<>(); + yearData.put("year", annual.getAnnualName()); + List compScoreList = iPersonalCompScoreService.list(new LambdaQueryWrapper() + .eq(PersonalCompScore::getWorkOn, person.getWorkOn()) + .eq(PersonalCompScore::getAnnualId, annual.getId())); + if (!ObjectUtils.isEmpty(compScoreList)) { + double sum = compScoreList.stream().mapToDouble(PersonalCompScore::getScore).sum(); + baseScore.getAndUpdate(val -> val.add(new BigDecimal(sum))); + } + yearData.put("score", baseScore); + last4YearData.add(yearData); + }); + studentInfoMap.put("last4YearData", last4YearData); studentInfoMap.put("workNo", person.getWorkOn()); studentInfoMap.put("name", sysUser.getRealname()); studentInfoMap.put("major", "软件工程");