| Line 629... |
Line 629... |
| 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
|
| 633 |
.selectSchemeByPartnerTypeFofoId(partnerType, date, searchModel, loginDetails.getFofoId(), offset, limit).stream()
|
633 |
.selectSchemeByPartnerTypeFofoId(partnerType, date, searchModel, loginDetails.getFofoId(), offset, limit).stream()
|
| 634 |
.filter(x -> {
|
- |
|
| 635 |
return (x.getId() != 411 && x.getId() != 612) || date1.isBefore(LocalDate.of(2021, 12, 1));
|
634 |
.filter(x -> (x.getId() != 411 && x.getId() != 612)).collect(Collectors.toList());
|
| 636 |
}).collect(Collectors.toList());
|
- |
|
| 637 |
// Remove 411 and 612
|
635 |
// Remove 411 and 612
|
| 638 |
// this.setSchemeAmountModel(schemes);
|
636 |
// this.setSchemeAmountModel(schemes);
|
| 639 |
int nlc = this.getNlc(item, loginDetails.getFofoId(), schemes, tagListing);
|
637 |
int nlc = this.getNlc(item, loginDetails.getFofoId(), schemes, tagListing);
|
| 640 |
// For 7720(HR) remove investment
|
638 |
// For 7720(HR) remove investment
|
| 641 |
model.addAttribute("schemes", schemes);
|
639 |
model.addAttribute("schemes", schemes);
|