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));