From 527f6ecd69e3c35885204f50d736b0e58ad2dd0b Mon Sep 17 00:00:00 2001 From: "hhb@hotmail.com" Date: Tue, 27 May 2025 11:51:17 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BA=94=E8=82=B2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FiveEducationController.java | 3 +- .../controller/LaborEducationController.java | 9 ++-- .../controller/MoralEducationController.java | 8 +-- .../admin/service/LaborEducationService.java | 9 ++-- .../admin/service/MoralEducationService.java | 9 ++-- .../impl/FiveEducationServiceImpl.java | 8 +-- .../impl/LaborEducationServiceImpl.java | 49 ++++++++++++------- .../impl/MoralEducationServiceImpl.java | 49 ++++++++++++------- 8 files changed, 89 insertions(+), 55 deletions(-) diff --git a/src/main/java/cn/teammodel/controller/admin/controller/FiveEducationController.java b/src/main/java/cn/teammodel/controller/admin/controller/FiveEducationController.java index f494747..130579b 100644 --- a/src/main/java/cn/teammodel/controller/admin/controller/FiveEducationController.java +++ b/src/main/java/cn/teammodel/controller/admin/controller/FiveEducationController.java @@ -7,6 +7,7 @@ import cn.teammodel.model.dto.admin.common.FiveDto; import cn.teammodel.model.dto.admin.exam.OverViewDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -22,7 +23,7 @@ import java.util.Map; public class FiveEducationController { @Resource private FiveEducationService fiveEducationService; - @RequestMapping("getAnalysis") + @PostMapping("getAnalysis") @ApiOperation("获取五育看板详细内容") public R> getAnalysis(@Valid @RequestBody FiveDto fiveDto, HttpServletRequest request) { Map res = fiveEducationService.getAnalysis(fiveDto,request); diff --git a/src/main/java/cn/teammodel/controller/admin/controller/LaborEducationController.java b/src/main/java/cn/teammodel/controller/admin/controller/LaborEducationController.java index 831725e..d31d687 100644 --- a/src/main/java/cn/teammodel/controller/admin/controller/LaborEducationController.java +++ b/src/main/java/cn/teammodel/controller/admin/controller/LaborEducationController.java @@ -3,6 +3,7 @@ package cn.teammodel.controller.admin.controller; import cn.teammodel.common.R; import cn.teammodel.controller.admin.service.ExamService; import cn.teammodel.controller.admin.service.LaborEducationService; +import cn.teammodel.model.dto.admin.Moral.MoralDto; import cn.teammodel.model.dto.admin.exam.OverViewDto; import cn.teammodel.model.dto.admin.labor.FindDto; import cn.teammodel.model.dto.admin.labor.LaborDto; @@ -27,7 +28,7 @@ public class LaborEducationController { private LaborEducationService laborEducationService; @PostMapping("getLaborAnalysis") @ApiOperation("获取德育看板详细内容") - public R> getLaborAnalysis(@Valid @RequestBody LaborDto laborDto, HttpServletRequest request) { + public R> getLaborAnalysis(@Valid @RequestBody MoralDto laborDto, HttpServletRequest request) { Map res = laborEducationService.getAnalysis(laborDto,request); return R.success(res); } @@ -39,20 +40,20 @@ public class LaborEducationController { } @PostMapping("getStudentSemesterScores") @ApiOperation("分学期比对分析") - public R> getStudentSemesterScores(@Valid @RequestBody LaborDto laborDto, HttpServletRequest request) { + public R> getStudentSemesterScores(@Valid @RequestBody MoralDto laborDto, HttpServletRequest request) { Map res = laborEducationService.getStudentSemesterScores(laborDto,request); return R.success(res); } @PostMapping("getStudentMonthlyScores") @ApiOperation("按月比对分析") - public R>>> getStudentMonthlyScores(@Valid @RequestBody LaborDto laborDto, HttpServletRequest request) { + public R>>> getStudentMonthlyScores(@Valid @RequestBody MoralDto laborDto, HttpServletRequest request) { Map>> res = laborEducationService.getStudentMonthlyScores(laborDto,request); return R.success(res); } @PostMapping("getExamDetails") @ApiOperation("获取指定考试数据") - public R> getExamDetails(@Valid @RequestBody LaborDto laborDto, HttpServletRequest request) { + public R> getExamDetails(@Valid @RequestBody MoralDto laborDto, HttpServletRequest request) { Map res = laborEducationService.getExamDetails(laborDto,request); return R.success(res); } diff --git a/src/main/java/cn/teammodel/controller/admin/controller/MoralEducationController.java b/src/main/java/cn/teammodel/controller/admin/controller/MoralEducationController.java index 290cc91..8526b0c 100644 --- a/src/main/java/cn/teammodel/controller/admin/controller/MoralEducationController.java +++ b/src/main/java/cn/teammodel/controller/admin/controller/MoralEducationController.java @@ -26,7 +26,7 @@ public class MoralEducationController { private MoralEducationService moralEducationService; @PostMapping("getMoralAnalysis") @ApiOperation("获取劳育看板详细内容") - public R> getMoralAnalysis(@Valid @RequestBody MoralDto moralDto, HttpServletRequest request) { + public R> getMoralAnalysis(@Valid @RequestBody LaborDto moralDto, HttpServletRequest request) { Map res = moralEducationService.getAnalysis(moralDto,request); return R.success(res); } @@ -38,21 +38,21 @@ public class MoralEducationController { } @PostMapping("getStudentSemesterScores") @ApiOperation("分学期比对分析") - public R> getStudentSemesterScores(@Valid @RequestBody MoralDto moralDto, HttpServletRequest request) { + public R> getStudentSemesterScores(@Valid @RequestBody LaborDto moralDto, HttpServletRequest request) { Map res = moralEducationService.getStudentSemesterScores(moralDto,request); return R.success(res); } @PostMapping("getStudentMonthlyScores") @ApiOperation("按月比对分析") - public R>>> getStudentMonthlyScores(@Valid @RequestBody MoralDto moralDto, HttpServletRequest request) { + public R>>> getStudentMonthlyScores(@Valid @RequestBody LaborDto moralDto, HttpServletRequest request) { Map>> res = moralEducationService.getStudentMonthlyScores(moralDto,request); return R.success(res); } @PostMapping("getExamDetails") @ApiOperation("获取指定考试数据") - public R> getExamDetails(@Valid @RequestBody MoralDto moralDto, HttpServletRequest request) { + public R> getExamDetails(@Valid @RequestBody LaborDto moralDto, HttpServletRequest request) { Map res = moralEducationService.getExamDetails(moralDto,request); return R.success(res); } diff --git a/src/main/java/cn/teammodel/controller/admin/service/LaborEducationService.java b/src/main/java/cn/teammodel/controller/admin/service/LaborEducationService.java index f5ddc6f..2b85c56 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/LaborEducationService.java +++ b/src/main/java/cn/teammodel/controller/admin/service/LaborEducationService.java @@ -1,5 +1,6 @@ package cn.teammodel.controller.admin.service; +import cn.teammodel.model.dto.admin.Moral.MoralDto; import cn.teammodel.model.dto.admin.exam.OverViewDto; import cn.teammodel.model.dto.admin.labor.FindDto; import cn.teammodel.model.dto.admin.labor.LaborDto; @@ -10,9 +11,9 @@ import java.util.List; import java.util.Map; public interface LaborEducationService { - Map getAnalysis(LaborDto laborDto, HttpServletRequest request); + Map getAnalysis(MoralDto laborDto, HttpServletRequest request); Map getDetails(FindDto findDto, HttpServletRequest request); - Map getStudentSemesterScores(LaborDto laborDto, HttpServletRequest request); - Map>> getStudentMonthlyScores(LaborDto laborDto,HttpServletRequest request); - Map getExamDetails(LaborDto laborDto,HttpServletRequest request); + Map getStudentSemesterScores(MoralDto laborDto, HttpServletRequest request); + Map>> getStudentMonthlyScores(MoralDto laborDto,HttpServletRequest request); + Map getExamDetails(MoralDto laborDto,HttpServletRequest request); } diff --git a/src/main/java/cn/teammodel/controller/admin/service/MoralEducationService.java b/src/main/java/cn/teammodel/controller/admin/service/MoralEducationService.java index 6d1cf8e..643893f 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/MoralEducationService.java +++ b/src/main/java/cn/teammodel/controller/admin/service/MoralEducationService.java @@ -2,15 +2,16 @@ package cn.teammodel.controller.admin.service; import cn.teammodel.model.dto.admin.Moral.MoralDto; import cn.teammodel.model.dto.admin.labor.FindDto; +import cn.teammodel.model.dto.admin.labor.LaborDto; import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; public interface MoralEducationService { - Map getAnalysis(MoralDto moralDto, HttpServletRequest request); + Map getAnalysis(LaborDto moralDto, HttpServletRequest request); Map getDetails(FindDto findDto, HttpServletRequest request); - Map getStudentSemesterScores(MoralDto moralDto, HttpServletRequest request); - Map>> getStudentMonthlyScores(MoralDto moralDto,HttpServletRequest request); - Map getExamDetails(MoralDto moralDto,HttpServletRequest request); + Map getStudentSemesterScores(LaborDto moralDto, HttpServletRequest request); + Map>> getStudentMonthlyScores(LaborDto moralDto,HttpServletRequest request); + Map getExamDetails(LaborDto moralDto,HttpServletRequest request); } diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/FiveEducationServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/FiveEducationServiceImpl.java index 96f5777..cd54f6f 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/FiveEducationServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/FiveEducationServiceImpl.java @@ -48,16 +48,16 @@ public class FiveEducationServiceImpl implements FiveEducationService { }*/ // 3. 德育分析（异步执行） - if (dto.getLaborDto() != null) { + if (dto.getMoralDto() != null) { futures.add(CompletableFuture.runAsync(() -> { - integratedResult.put("moralAnalysis", laborEducationService.getAnalysis(dto.getLaborDto(), request)); + integratedResult.put("moralAnalysis", laborEducationService.getAnalysis(dto.getMoralDto(), request)); }, executor)); } // 4. 劳育分析（异步执行） - if (dto.getMoralDto() != null) { + if (dto.getLaborDto() != null) { futures.add(CompletableFuture.runAsync(() -> { - integratedResult.put("laborAnalysis", moralLaborService.getAnalysis(dto.getMoralDto(), request)); + integratedResult.put("laborAnalysis", moralLaborService.getAnalysis(dto.getLaborDto(), request)); }, executor)); } diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java index ef74e62..d47d3a6 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/LaborEducationServiceImpl.java @@ -5,12 +5,12 @@ import cn.teammodel.common.PK; import cn.teammodel.config.exception.ServiceException; import cn.teammodel.controller.admin.service.CommonService; import cn.teammodel.controller.admin.service.LaborEducationService; +import cn.teammodel.model.dto.admin.Moral.MoralDto; import cn.teammodel.model.dto.admin.common.GCDto; import cn.teammodel.model.dto.admin.common.GroupDto; import cn.teammodel.model.dto.admin.common.RGroupList; import cn.teammodel.model.dto.admin.common.RMember; import cn.teammodel.model.dto.admin.labor.FindDto; -import cn.teammodel.model.dto.admin.labor.LaborDto; import cn.teammodel.model.entity.appraise.Appraise; import cn.teammodel.model.entity.appraise.AppraiseTreeNode; import cn.teammodel.model.entity.common.Exam; @@ -82,7 +82,7 @@ public class LaborEducationServiceImpl implements LaborEducationService { LaborEducationServiceImpl.environment = env; // 在初始化时将非静态字段赋值给静态字段 } @Override - public Map getAnalysis(LaborDto laborDto, HttpServletRequest request) { + public Map getAnalysis(MoralDto laborDto, HttpServletRequest request) { //根据具体参数查询相关课列内容 List records; @@ -184,6 +184,7 @@ public class LaborEducationServiceImpl implements LaborEducationService { } } } + List examResults = new ArrayList<>(); if (!examIds.isEmpty()) { examResults = examClassResultRepository.findAll(String.format(PK.CLASS_RESULT, laborDto.getCode()),examIds); @@ -242,7 +243,7 @@ public class LaborEducationServiceImpl implements LaborEducationService { return resMap; } @Override - public Map getExamDetails(LaborDto laborDto, HttpServletRequest request) { + public Map getExamDetails(MoralDto laborDto, HttpServletRequest request) { Map resMap = new HashMap<>(); try { List examResults = new ArrayList<>(); @@ -668,8 +669,8 @@ public class LaborEducationServiceImpl implements LaborEducationService { double defaultScore = 60.0; if (parentNode == null) { // 若知识块无对应父节点，归入全局默认块 - parentNodeScoreRates.merge("默认块", defaultScore, Double::sum); - parentNodeScoreCount.merge("默认块", 1, Integer::sum); + //parentNodeScoreRates.merge("默认块", defaultScore, Double::sum); + //parentNodeScoreCount.merge("默认块", 1, Integer::sum); } else { // 归入知识块对应的父节点 parentNodeScoreRates.merge(parentNode.getName(), defaultScore, Double::sum); @@ -1502,7 +1503,7 @@ public class LaborEducationServiceImpl implements LaborEducationService { //获取每月各个知识库综合得分以及整体得分内容 -public Map>> getStudentMonthlyScores(LaborDto laborDto,HttpServletRequest request) { +public Map>> getStudentMonthlyScores(MoralDto laborDto,HttpServletRequest request) { // 1. 获取基础信息 String schoolId = SecurityUtil.getLoginUser().getSchoolId(); String studentId = laborDto.getStudentId(); @@ -1677,7 +1678,7 @@ public Map>> getStudentMonthlyScores(LaborDto la return result; } - private List getLessonRecords(LaborDto laborDto, String schoolId) { + private List getLessonRecords(MoralDto laborDto, String schoolId) { LessonRecordQueryService queryService = new LessonRecordQueryService(lessonRecordRepository); try { return queryService.queryLessonsInParallel( @@ -1696,7 +1697,7 @@ public Map>> getStudentMonthlyScores(LaborDto la } } - private List getExamsWithKnowledge(LaborDto laborDto, List records, + private List getExamsWithKnowledge(MoralDto laborDto, List records, Map>> examKnowledgeMap, Map> points) { if (records == null || records.isEmpty()) { @@ -1912,7 +1913,21 @@ public Map>> getStudentMonthlyScores(LaborDto la // 按知识块名称排序（可选） scoreList.sort(Comparator.comparing(m -> (String) m.get("name"))); + //所有知识块score求平均 + double totalScore = 0.0; + int count = 0; + + for (Map scoreEntry : scoreList) { + if (scoreEntry.get("score") instanceof Double) { + totalScore += (Double) scoreEntry.get("score"); + count++; + } + } + double averageScore = count > 0 ? totalScore / count : 0.0; + //保留两位小数 + averageScore = Double.parseDouble(String.format("%.2f", averageScore)); + monthEntry.put("averageScore", averageScore); monthEntry.put("types", scoreList); return monthEntry; }).sorted(Comparator.comparingInt(m -> (Integer) m.get("month"))) @@ -2084,7 +2099,7 @@ public Map>> getStudentMonthlyScores(LaborDto la } // 分学期比对，分析 学期数据 - public Map getStudentSemesterScores(LaborDto laborDto,HttpServletRequest request) { + public Map getStudentSemesterScores(MoralDto laborDto,HttpServletRequest request) { // 1. 获取学期配置 List semesters = schoolRepository.findSemestersById(laborDto.getCode(), laborDto.getPeriodId()); List configs = new ArrayList<>(); @@ -2111,7 +2126,7 @@ public Map>> getStudentMonthlyScores(LaborDto la return combineAllResults(laborDto, studentResult, classResult); } - private Map combineAllResults(LaborDto dto, + private Map combineAllResults(MoralDto dto, Map studentResult, Map classResult) { Map finalResult = new LinkedHashMap<>(); @@ -2127,7 +2142,7 @@ public Map>> getStudentMonthlyScores(LaborDto la return finalResult; } - private Map processIndividual(LaborDto dto, + private Map processIndividual(MoralDto dto, SemesterPeriod current, SemesterPeriod last, HttpServletRequest request) { @@ -2137,12 +2152,12 @@ public Map>> getStudentMonthlyScores(LaborDto la return combineResults(dto, currentData, lastData); } - private Map processClass(LaborDto dto, + private Map processClass(MoralDto dto, SemesterPeriod current, SemesterPeriod last, HttpServletRequest request) { // 克隆DTO并清除学生ID - LaborDto classDto = new LaborDto(); + MoralDto classDto = new MoralDto(); classDto.setCode(dto.getCode()); classDto.setPeriodId(dto.getPeriodId()); classDto.setClassId(dto.getClassId()); @@ -2164,7 +2179,7 @@ public Map>> getStudentMonthlyScores(LaborDto la return combineClassResults(classDto, currentData, lastData); } - private Map combineClassResults(LaborDto dto, + private Map combineClassResults(MoralDto dto, Map current, Map last) { Map result = new LinkedHashMap<>(); @@ -2177,7 +2192,7 @@ public Map>> getStudentMonthlyScores(LaborDto la return result; } - private List> buildClassScoreBlocks(LaborDto dto, + private List> buildClassScoreBlocks(MoralDto dto, Map current, Map last) { @@ -2342,7 +2357,7 @@ public Map>> getStudentMonthlyScores(LaborDto la } // 处理学期数据 - private Map processSemesterData(LaborDto laborDto, + private Map processSemesterData(MoralDto laborDto, SemesterPeriod semester, HttpServletRequest request, boolean isCurrent, @@ -2443,7 +2458,7 @@ public Map>> getStudentMonthlyScores(LaborDto la } // 结果合并方法 - private Map combineResults(LaborDto laborDto, + private Map combineResults(MoralDto laborDto, Map currentData, Map lastData) { Map result = new LinkedHashMap<>(); diff --git a/src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java b/src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java index d768402..c3f831b 100644 --- a/src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java +++ b/src/main/java/cn/teammodel/controller/admin/service/impl/MoralEducationServiceImpl.java @@ -5,7 +5,6 @@ import cn.teammodel.common.PK; import cn.teammodel.config.exception.ServiceException; import cn.teammodel.controller.admin.service.CommonService; import cn.teammodel.controller.admin.service.MoralEducationService; -import cn.teammodel.model.dto.admin.Moral.MoralDto; import cn.teammodel.model.dto.admin.common.GCDto; import cn.teammodel.model.dto.admin.common.GroupDto; import cn.teammodel.model.dto.admin.common.RGroupList; @@ -83,7 +82,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { MoralEducationServiceImpl.environment = env; // 在初始化时将非静态字段赋值给静态字段 } @Override - public Map getAnalysis(MoralDto moralDto, HttpServletRequest request) { + public Map getAnalysis(LaborDto moralDto, HttpServletRequest request) { //根据具体参数查询相关课列内容 List records; @@ -243,7 +242,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { return resMap; } @Override - public Map getExamDetails(MoralDto moralDto, HttpServletRequest request) { + public Map getExamDetails(LaborDto moralDto, HttpServletRequest request) { Map resMap = new HashMap<>(); try { List examResults = new ArrayList<>(); @@ -669,8 +668,8 @@ public class MoralEducationServiceImpl implements MoralEducationService { double defaultScore = 60.0; if (parentNode == null) { // 若知识块无对应父节点，归入全局默认块 - parentNodeScoreRates.merge("默认块", defaultScore, Double::sum); - parentNodeScoreCount.merge("默认块", 1, Integer::sum); + //parentNodeScoreRates.merge("默认块", defaultScore, Double::sum); + //parentNodeScoreCount.merge("默认块", 1, Integer::sum); } else { // 归入知识块对应的父节点 parentNodeScoreRates.merge(parentNode.getName(), defaultScore, Double::sum); @@ -1503,7 +1502,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { //获取每月各个知识库综合得分以及整体得分内容 - public Map>> getStudentMonthlyScores(MoralDto moralDto,HttpServletRequest request) { + public Map>> getStudentMonthlyScores(LaborDto moralDto,HttpServletRequest request) { // 1. 获取基础信息 String schoolId = SecurityUtil.getLoginUser().getSchoolId(); String studentId = moralDto.getStudentId(); @@ -1676,7 +1675,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { return result; } - private List getLessonRecords(MoralDto moralDto, String schoolId) { + private List getLessonRecords(LaborDto moralDto, String schoolId) { LessonRecordQueryService queryService = new LessonRecordQueryService(lessonRecordRepository); try { return queryService.queryLessonsInParallel( @@ -1695,7 +1694,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { } } - private List getExamsWithKnowledge(MoralDto moralDto, List records, + private List getExamsWithKnowledge(LaborDto moralDto, List records, Map>> examKnowledgeMap, Map> points) { if (records == null || records.isEmpty()) { @@ -1909,6 +1908,22 @@ public class MoralEducationServiceImpl implements MoralEducationService { // 按知识块名称排序（可选） scoreList.sort(Comparator.comparing(m -> (String) m.get("name"))); + //所有知识块score求平均 + double totalScore = 0.0; + int count = 0; + + for (Map scoreEntry : scoreList) { + if (scoreEntry.get("score") instanceof Double) { + totalScore += (Double) scoreEntry.get("score"); + count++; + } + } + + double averageScore = count > 0 ? totalScore / count : 0.0; + //保留两位小数 + averageScore = Double.parseDouble(String.format("%.2f", averageScore)); + monthEntry.put("averageScore", averageScore); + monthEntry.put("types", scoreList); return monthEntry; }).sorted(Comparator.comparingInt(m -> (Integer) m.get("month"))) @@ -2080,7 +2095,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { } // 分学期比对，分析 学期数据 - public Map getStudentSemesterScores(MoralDto moralDto,HttpServletRequest request) { + public Map getStudentSemesterScores(LaborDto moralDto,HttpServletRequest request) { // 1. 获取学期配置 List semesters = schoolRepository.findSemestersById(moralDto.getCode(), moralDto.getPeriodId()); List configs = new ArrayList<>(); @@ -2107,7 +2122,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { return combineAllResults(moralDto, studentResult, classResult); } - private Map combineAllResults(MoralDto dto, + private Map combineAllResults(LaborDto dto, Map studentResult, Map classResult) { Map finalResult = new LinkedHashMap<>(); @@ -2123,7 +2138,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { return finalResult; } - private Map processIndividual(MoralDto dto, + private Map processIndividual(LaborDto dto, SemesterPeriod current, SemesterPeriod last, HttpServletRequest request) { @@ -2133,12 +2148,12 @@ public class MoralEducationServiceImpl implements MoralEducationService { return combineResults(dto, currentData, lastData); } - private Map processClass(MoralDto dto, + private Map processClass(LaborDto dto, SemesterPeriod current, SemesterPeriod last, HttpServletRequest request) { // 克隆DTO并清除学生ID - MoralDto classDto = new MoralDto(); + LaborDto classDto = new LaborDto(); classDto.setCode(dto.getCode()); classDto.setPeriodId(dto.getPeriodId()); classDto.setClassId(dto.getClassId()); @@ -2160,7 +2175,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { return combineClassResults(classDto, currentData, lastData); } - private Map combineClassResults(MoralDto dto, + private Map combineClassResults(LaborDto dto, Map current, Map last) { Map result = new LinkedHashMap<>(); @@ -2173,7 +2188,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { return result; } - private List> buildClassScoreBlocks(MoralDto dto, + private List> buildClassScoreBlocks(LaborDto dto, Map current, Map last) { @@ -2338,7 +2353,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { } // 处理学期数据 - private Map processSemesterData(MoralDto moralDto, + private Map processSemesterData(LaborDto moralDto, SemesterPeriod semester, HttpServletRequest request, boolean isCurrent, @@ -2439,7 +2454,7 @@ public class MoralEducationServiceImpl implements MoralEducationService { } // 结果合并方法 - private Map combineResults(MoralDto moralDto, + private Map combineResults(LaborDto moralDto, Map currentData, Map lastData) { Map result = new LinkedHashMap<>();