目标fix

songhuangfeng123

2022-08-22 da981624e169b181b170e5d92986e190b9ff8052

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java

@@ -56,86 +56,6 @@
    @Autowired
    private TargetTypeRepository targetTypeRepository;

    @Override
    public ResultVO queryAll(PageQuery<TargetExamineQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
        Long pageSize = pageQuery.getPageSize();
        IPage<TargetMng> page = new Page<>(pageIndex, pageSize);

        page = targetMngRepository.selectPage(page,
                QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
        List<TargetExamineDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetExamineDto.class);
        respList.forEach(dto->{
            //查询关联分解信息
            TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
            criteria.setTargetId(dto.getId());
            List<TargetDivideDetailDto> respList1 = BeanCopyUtils.copyBeanList(targetDivideDetailService.queryAll(criteria), TargetDivideDetailDto.class);

            // --------------------------- 获取部门信息-----------------------
            //收集所用到的部门ID
            Set<Long> collectDepIdSet = new HashSet();
            respList1.forEach(f->{
                collectDepIdSet.add(f.getDutyDepartmentId());
                collectDepIdSet.add(f.getMakerDepartmentId());
            });
            //获取部门名集合
            Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);

            respList1.forEach(f->{
                f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
                f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
            });


            // --------------------------- 获取目标分类名称-----------------------
            //收集所用到的目标分类ID
            Set<Long> collectTypeSet = new HashSet();
            respList1.forEach(f->{
                collectTypeSet.add(f.getTargetTypeId());
            });
            //获取目标分类名集合
            if(!collectTypeSet.isEmpty()){
                List<TargetType> typeList = targetTypeRepository.selectBatchIds(collectTypeSet); // TODO
                Map<Long,String> typeNameMap = typeList.stream()
                        .collect(Collectors.toMap(TargetType::getId, TargetType::getTypeName,(k1, k2)->k1));

                respList1.forEach(f->{
                    f.setTargetTypeName(typeNameMap.get(f.getTargetTypeId()));
                });
            }


            // --------------------------- 获取考核结果-----------------------
            //收集所用到的分解详情ID
            Set<Long> collectExamResultSet = new HashSet();
            respList1.forEach(f->{
                collectExamResultSet.add(f.getId());
            });
            //获取核结果集合
            if(!collectTypeSet.isEmpty()){
                List<TargetExamine> typeList = targetExamineRepository.selectBatchIds(collectTypeSet);
                Map<Long,Integer> examResultMap = typeList.stream()
                        .collect(Collectors.toMap(TargetExamine::getId, TargetExamine::getExamineResult,(k1, k2)->k1));

                respList1.forEach(f->{
                    f.setExamineResult(examResultMap.get(f.getId()));
                });
            }


            dto.setTargetDivideDetailList(respList1);
        });

        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize,page.getPages(),
                page.getTotal(),
                respList,
                ResultCodes.OK
        );
    }


    @Override
    public List<TargetExamine> queryAll(TargetExamineQueryCriteria criteria) {