Subversion Repositories SmartDukaan

Rev

Rev 31387 | Rev 31504 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 31387 Rev 31482
Line 622... Line 622...
622
                        .selectSchemeByPartnerType(partnerType, date, searchModel, isAdmin, offset, limit).stream()
622
                        .selectSchemeByPartnerType(partnerType, date, searchModel, isAdmin, offset, limit).stream()
623
                        .filter(x -> x.getId() != 411 && x.getId() != 612).collect(Collectors.toList());
623
                        .filter(x -> x.getId() != 411 && x.getId() != 612).collect(Collectors.toList());
624
                this.setSchemeAmountModel(schemes);
624
                this.setSchemeAmountModel(schemes);
625
                model.addAttribute("schemes", schemes);
625
                model.addAttribute("schemes", schemes);
626
                List<SchemeRegion> schemeRegionList = schemeRegionRepository.selectAllBySchemeIds(schemes.stream().map(x -> x.getId()).collect(Collectors.toList()));
626
                List<SchemeRegion> schemeRegionList = schemeRegionRepository.selectAllBySchemeIds(schemes.stream().map(x -> x.getId()).collect(Collectors.toList()));
627
                Map<Integer, String> schemeRegionMap = schemeRegionList.stream().collect(Collectors.groupingBy(x -> x.getSchemeId(), Collectors.mapping(y -> regionRepository.selectById(y.getRegionId()).getName(), Collectors.joining(","))));
627
                Map<Integer, String> schemeRegionMap = schemeRegionList.stream().collect(Collectors.groupingBy(x -> x.getSchemeId(), Collectors.mapping(y -> regionRepository.selectById(y.getRegionId()).getName(), Collectors.joining(" ,"))));
628
                model.addAttribute("schemeRegionMap", schemeRegionMap);
628
                model.addAttribute("schemeRegionMap", schemeRegionMap);
629
                return "schemes";
629
                return "schemes";
630
            } else {
630
            } else {
631
                partnerType = partnerTypeChangeService.getTypeOnDate(loginDetails.getFofoId(), date);
631
                partnerType = partnerTypeChangeService.getTypeOnDate(loginDetails.getFofoId(), date);
632
                schemes = schemeService
632
                schemes = schemeService