ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 80229 车型项目库详情-判定为不涉及的数据，查看评估结果，回显多条

Browse Source
This commit is contained in:
lijiarao
2024-02-04 16:30:58 +08:00
parent 88ac95162d
commit 1e3de27b65
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessResultsServiceImpl.java
+5 -10
View File
@@ -23,6 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
@@ -107,9 +109,7 @@ public class LawsAssessResultsServiceImpl extends ServiceImpl<LawsAssessResultsM
QueryWrapper<LawsAssessResults> queryWrapper = QueryGenerator.initQueryWrapper(lawsAssessResults, parameterMap); QueryWrapper<LawsAssessResults> queryWrapper = QueryGenerator.initQueryWrapper(lawsAssessResults, parameterMap);
queryWrapper.lambda() queryWrapper.lambda()
.eq(LawsAssessResults::getProjectId,projectId) .eq(LawsAssessResults::getProjectId,projectId)
.eq(LawsAssessResults::getStandardId,standardId) .eq(LawsAssessResults::getStandardId,standardId);
.groupBy(LawsAssessResults::getTermNumber)
.groupBy(LawsAssessResults::getAssessorId);
Page<LawsAssessResults> page = new Page<>(pageNo, pageSize); Page<LawsAssessResults> page = new Page<>(pageNo, pageSize);
Page<LawsAssessResults> pageList = page(page, queryWrapper); Page<LawsAssessResults> pageList = page(page, queryWrapper);
for (LawsAssessResults assessResults : pageList.getRecords()) { for (LawsAssessResults assessResults : pageList.getRecords()) {
@@ -215,13 +215,8 @@ public class LawsAssessResultsServiceImpl extends ServiceImpl<LawsAssessResultsM
metNotMetVO.setNotInvolvedList(stringListMap.get(AssessCommon.NOT_INVOLVED)); metNotMetVO.setNotInvolvedList(stringListMap.get(AssessCommon.NOT_INVOLVED));
return metNotMetVO; return metNotMetVO;
}else { }else {
LambdaQueryWrapper<LawsAssessResults> queryWrapper = new LambdaQueryWrapper<>(); List<LawsAssessResults> assessResultsList = new ArrayList<>();
queryWrapper assessResultsList.add(assessResults);
.eq(LawsAssessResults::getProjectId,assessResults.getProjectId())
.eq(LawsAssessResults::getStandardId,assessResults.getStandardId())
.eq(LawsAssessResults::getAssessorId,assessResults.getAssessorId())
.eq(LawsAssessResults::getTermNumber,assessResults.getTermNumber());
List<LawsAssessResults> assessResultsList = this.list(queryWrapper);
Map<String, List<LawsAssessResults>> stringListMap = CollStreamUtil.groupByKey(assessResultsList, LawsAssessResults::getAssessResults); Map<String, List<LawsAssessResults>> stringListMap = CollStreamUtil.groupByKey(assessResultsList, LawsAssessResults::getAssessResults);
MetNotMetVO metNotMetVO = new MetNotMetVO(); MetNotMetVO metNotMetVO = new MetNotMetVO();
metNotMetVO.setAccordWithList(stringListMap.get(AssessCommon.ACCORD_WITH)); metNotMetVO.setAccordWithList(stringListMap.get(AssessCommon.ACCORD_WITH));