| Line 598... |
Line 598... |
| 598 |
model.addAttribute("mop", tagListing.getMop());
|
598 |
model.addAttribute("mop", tagListing.getMop());
|
| 599 |
}
|
599 |
}
|
| 600 |
schemes = schemeService.selectSchemeByPartnerType(partnerType, date, searchItem, isAdmin, offset, limit);
|
600 |
schemes = schemeService.selectSchemeByPartnerType(partnerType, date, searchItem, isAdmin, offset, limit);
|
| 601 |
//Remove 411 and 612
|
601 |
//Remove 411 and 612
|
| 602 |
model.addAttribute("schemes", schemes.stream().filter(x-> {
|
602 |
model.addAttribute("schemes", schemes.stream().filter(x-> {
|
| 603 |
return date1.isAfter(LocalDate.of(2021, 12, 1)) && x.getId()!=411 && x.getId()!=612;
|
603 |
return (x.getId()!=411 && x.getId()!=612) || date1.isBefore(LocalDate.of(2021, 12, 1));
|
| 604 |
}).collect(Collectors.toList()));
|
604 |
}).collect(Collectors.toList()));
|
| 605 |
if (schemes.size() == 0) {
|
605 |
if (schemes.size() == 0) {
|
| 606 |
if (isAdmin)
|
606 |
if (isAdmin)
|
| 607 |
return "schemes";
|
607 |
return "schemes";
|
| 608 |
else {
|
608 |
else {
|
| Line 666... |
Line 666... |
| 666 |
model.addAttribute("searchTerm", searchTerm);
|
666 |
model.addAttribute("searchTerm", searchTerm);
|
| 667 |
model.addAttribute("partnerType", partnerType);
|
667 |
model.addAttribute("partnerType", partnerType);
|
| 668 |
model.addAttribute("isAdmin", isAdmin);
|
668 |
model.addAttribute("isAdmin", isAdmin);
|
| 669 |
LOGGER.info("schemes" + schemes);
|
669 |
LOGGER.info("schemes" + schemes);
|
| 670 |
model.addAttribute("schemes", schemes !=null ? schemes.stream().filter(x-> {
|
670 |
model.addAttribute("schemes", schemes !=null ? schemes.stream().filter(x-> {
|
| 671 |
return date1.isAfter(LocalDate.of(2021, 12, 1)) && x.getId()!=411 && x.getId()!=612;
|
671 |
return (x.getId()!=411 && x.getId()!=612) || date1.isBefore(LocalDate.of(2021, 12, 1));
|
| 672 |
}).collect(Collectors.toList()) : null);
|
672 |
}).collect(Collectors.toList()) : null);
|
| 673 |
LOGGER.info("schemes" + schemes);
|
673 |
LOGGER.info("schemes" + schemes);
|
| 674 |
// model.addAttribute("roleTypes", loginDetails.getRoleTypes());
|
674 |
// model.addAttribute("roleTypes", loginDetails.getRoleTypes());
|
| 675 |
if (isAdmin)
|
675 |
if (isAdmin)
|
| 676 |
return "schemes";
|
676 |
return "schemes";
|