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

fix 项目库详情页-评估结果历史-通过id查询-符合/不符合项

Browse Source
This commit is contained in:
lijiarao
2024-02-03 18:09:11 +08:00
parent 46a9e76fc1
commit 501d6ef20e
1 changed files with 31 additions and 17 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
+31 -17
View File
@@ -118,7 +118,6 @@ public class LawsAssessResultsServiceImpl extends ServiceImpl<LawsAssessResultsM
assessResults.setStandardEnglishName(standardEnglishName); assessResults.setStandardEnglishName(standardEnglishName);
assessResults.setStandardState(standardState); assessResults.setStandardState(standardState);
assessResults.setSource(source); assessResults.setSource(source);
assessResults.setSource(source);
} }
return pageList; return pageList;
} }
@@ -197,27 +196,42 @@ public class LawsAssessResultsServiceImpl extends ServiceImpl<LawsAssessResultsM
LawsAssess assess = lawsAssessService.getById(id); LawsAssess assess = lawsAssessService.getById(id);
LambdaQueryWrapper<LawsAssessResults> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsAssessResults> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(LawsAssessResults::getProjectId,assess.getProjectId()) wrapper.eq(LawsAssessResults::getProjectId,assess.getProjectId())
.eq(LawsAssessResults::getStandardId,assess.getStandardId()) .eq(LawsAssessResults::getStandardId,assess.getStandardId());
.groupBy(LawsAssessResults::getTermNumber)
.groupBy(LawsAssessResults::getAssessorId);
wrapper.orderByDesc(LawsAssessResults::getCreateTime); wrapper.orderByDesc(LawsAssessResults::getCreateTime);
wrapper.last("limit 1"); wrapper.last("limit 1");
assessResults = this.getOne(wrapper); assessResults = this.getOne(wrapper);
LambdaQueryWrapper<LawsAssessResults> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper
.eq(LawsAssessResults::getProjectId,assessResults.getProjectId())
.eq(LawsAssessResults::getStandardId,assessResults.getStandardId())
.eq(LawsAssessResults::getProcessInstanceId,assessResults.getProcessInstanceId());
List<LawsAssessResults> assessResultsList = this.list(queryWrapper);
Map<String, List<LawsAssessResults>> stringListMap = CollStreamUtil.groupByKey(assessResultsList, LawsAssessResults::getAssessResults);
MetNotMetVO metNotMetVO = new MetNotMetVO();
metNotMetVO.setAccordWithList(stringListMap.get(AssessCommon.ACCORD_WITH));
metNotMetVO.setNotCompliantList(stringListMap.get(AssessCommon.NOT_COMPLIANT));
metNotMetVO.setToBeVerifiedList(stringListMap.get(AssessCommon.TO_BE_VERIFIED));
metNotMetVO.setNotInvolvedList(stringListMap.get(AssessCommon.NOT_INVOLVED));
return metNotMetVO;
}else {
LambdaQueryWrapper<LawsAssessResults> 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<LawsAssessResults> assessResultsList = this.list(queryWrapper);
Map<String, List<LawsAssessResults>> stringListMap = CollStreamUtil.groupByKey(assessResultsList, LawsAssessResults::getAssessResults);
MetNotMetVO metNotMetVO = new MetNotMetVO();
metNotMetVO.setAccordWithList(stringListMap.get(AssessCommon.ACCORD_WITH));
metNotMetVO.setNotCompliantList(stringListMap.get(AssessCommon.NOT_COMPLIANT));
metNotMetVO.setToBeVerifiedList(stringListMap.get(AssessCommon.TO_BE_VERIFIED));
metNotMetVO.setNotInvolvedList(stringListMap.get(AssessCommon.NOT_INVOLVED));
return metNotMetVO;
} }
LambdaQueryWrapper<LawsAssessResults> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper
.eq(LawsAssessResults::getProjectId,assessResults.getProjectId())
.eq(LawsAssessResults::getStandardId,assessResults.getStandardId())
.eq(LawsAssessResults::getTermNumber,assessResults.getTermNumber());
List<LawsAssessResults> assessResultsList = this.list(queryWrapper);
Map<String, List<LawsAssessResults>> stringListMap = CollStreamUtil.groupByKey(assessResultsList, LawsAssessResults::getAssessResults);
MetNotMetVO metNotMetVO = new MetNotMetVO();
metNotMetVO.setAccordWithList(stringListMap.get(AssessCommon.ACCORD_WITH));
metNotMetVO.setNotCompliantList(stringListMap.get(AssessCommon.NOT_COMPLIANT));
metNotMetVO.setToBeVerifiedList(stringListMap.get(AssessCommon.TO_BE_VERIFIED));
metNotMetVO.setNotInvolvedList(stringListMap.get(AssessCommon.NOT_INVOLVED));
return metNotMetVO;
} }
} }