From 1e3de27b65002a42753a3e1a3f8a144af5b3f604 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Sun, 4 Feb 2024 16:30:58 +0800 Subject: [PATCH] =?UTF-8?q?fix=2080229=20=E8=BD=A6=E5=9E=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E4=B8=BA=E4=B8=8D=E6=B6=89=E5=8F=8A=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E6=98=BE=E5=A4=9A=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsAssessResultsServiceImpl.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java index 78bdbd00..09987b1b 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java @@ -23,6 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; + +import java.util.ArrayList; import java.util.List; import java.util.Date; import java.util.Map; @@ -107,9 +109,7 @@ public class LawsAssessResultsServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(lawsAssessResults, parameterMap); queryWrapper.lambda() .eq(LawsAssessResults::getProjectId,projectId) - .eq(LawsAssessResults::getStandardId,standardId) - .groupBy(LawsAssessResults::getTermNumber) - .groupBy(LawsAssessResults::getAssessorId); + .eq(LawsAssessResults::getStandardId,standardId); Page page = new Page<>(pageNo, pageSize); Page pageList = page(page, queryWrapper); for (LawsAssessResults assessResults : pageList.getRecords()) { @@ -215,13 +215,8 @@ public class LawsAssessResultsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper - .eq(LawsAssessResults::getProjectId,assessResults.getProjectId()) - .eq(LawsAssessResults::getStandardId,assessResults.getStandardId()) - .eq(LawsAssessResults::getAssessorId,assessResults.getAssessorId()) - .eq(LawsAssessResults::getTermNumber,assessResults.getTermNumber()); - List assessResultsList = this.list(queryWrapper); + List assessResultsList = new ArrayList<>(); + assessResultsList.add(assessResults); Map> stringListMap = CollStreamUtil.groupByKey(assessResultsList, LawsAssessResults::getAssessResults); MetNotMetVO metNotMetVO = new MetNotMetVO(); metNotMetVO.setAccordWithList(stringListMap.get(AssessCommon.ACCORD_WITH));