|
@@ -101,7 +101,9 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
|
|
|
Integer statusType = finalProfGroupQueryDTO.getStatueType();
|
|
|
//根据projectId查询最终无效理由和证据
|
|
|
LambdaQueryWrapper<FinalInvalidStatue> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.eq(FinalInvalidStatue::getProjectId, projectId);
|
|
|
+ queryWrapper.eq(FinalInvalidStatue::getProjectId, projectId)
|
|
|
+ .orderByAsc(FinalInvalidStatue::getStatuteId)
|
|
|
+ .orderByAsc(FinalInvalidStatue::getClaimOrder);
|
|
|
|
|
|
if (statusType != null) {
|
|
|
if (statusType.equals(1)) {
|
|
@@ -121,20 +123,23 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
|
|
|
LambdaQueryWrapper<FinalProofGroup> queryWrapper1 = new LambdaQueryWrapper<>();
|
|
|
queryWrapper1.in(FinalProofGroup::getFinalInvalidStatueId, ids).orderByDesc(FinalProofGroup::getFinalInvalidStatueId);
|
|
|
finalProofGroups = finalProofGroupService.list(queryWrapper1);
|
|
|
- finalProofGroups.forEach(item -> {
|
|
|
- FinalProfGroupVO finalProfGroupVO = new FinalProfGroupVO();
|
|
|
- FinalInvalidStatue finalInvalidStatue = finalInvalidStatues.stream()
|
|
|
- .filter(tem -> tem.getId().equals(item.getFinalInvalidStatueId())).findFirst().orElse(null);
|
|
|
- if (finalInvalidStatue != null) {
|
|
|
- finalProfGroupVO.setInvalidStatue(finalInvalidStatue);
|
|
|
- }
|
|
|
- finalProfGroupVO.setId(item.getId());
|
|
|
- finalProfGroupVO.setPresentOpinions(item.getPresentOpinions());
|
|
|
- finalProfGroupVO.setInvalidReason(item.getInvalidReason());
|
|
|
- finalProfGroupVO.setRbDecision(item.getRbDecision());
|
|
|
- finalProfGroupVOS.add(finalProfGroupVO);
|
|
|
|
|
|
- });
|
|
|
+ for(FinalInvalidStatue finalInvalidStatue:finalInvalidStatues)
|
|
|
+ {
|
|
|
+ Integer id =finalInvalidStatue.getId();
|
|
|
+ List<FinalProofGroup> statueGroups =finalProofGroups.stream().filter(item->item.getFinalInvalidStatueId().equals(id)).collect(Collectors.toList());
|
|
|
+ statueGroups.forEach(item->{
|
|
|
+ FinalProfGroupVO finalProfGroupVO = new FinalProfGroupVO();
|
|
|
+ if (finalInvalidStatue != null) {
|
|
|
+ finalProfGroupVO.setInvalidStatue(finalInvalidStatue);
|
|
|
+ }
|
|
|
+ finalProfGroupVO.setId(item.getId());
|
|
|
+ finalProfGroupVO.setPresentOpinions(item.getPresentOpinions());
|
|
|
+ finalProfGroupVO.setInvalidReason(item.getInvalidReason());
|
|
|
+ finalProfGroupVO.setRbDecision(item.getRbDecision());
|
|
|
+ finalProfGroupVOS.add(finalProfGroupVO);
|
|
|
+ });
|
|
|
+ }
|
|
|
return finalProfGroupVOS;
|
|
|
}
|
|
|
|