| Line 615... |
Line 615... |
| 615 |
.selectAllPurchaseInventoryByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
|
615 |
.selectAllPurchaseInventoryByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
|
| 616 |
|
616 |
|
| 617 |
AllPurchaseInventoryModel partnerFrontIncomes = schemeInOutRepository
|
617 |
AllPurchaseInventoryModel partnerFrontIncomes = schemeInOutRepository
|
| 618 |
.selectFrontIncomeByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
|
618 |
.selectFrontIncomeByFofoId(loginDetails.getFofoId(), startOfMonth, endOfMonth);
|
| 619 |
|
619 |
|
| 620 |
AllPurchaseInventoryModel partnerAdditionalIncome = offerRepository.selectPurchaseIncome(loginDetails.getFofoId(), startOfMonth, endOfMonth)
|
620 |
//AllPurchaseInventoryModel partnerAdditionalIncome = offerRepository.selectPurchaseIncome(loginDetails.getFofoId(), startOfMonth, endOfMonth);
|
| 621 |
|
621 |
|
| 622 |
LOGGER.info("partnerfrontIncomes" + partnerFrontIncomes);
|
622 |
LOGGER.info("partnerfrontIncomes" + partnerFrontIncomes);
|
| 623 |
|
623 |
|
| 624 |
LOGGER.info("partnerCreditedSaleAmount" + partnerCreditedSaleAmount);
|
624 |
LOGGER.info("partnerCreditedSaleAmount" + partnerCreditedSaleAmount);
|
| 625 |
LOGGER.info("partnerPurchaseInAmount" + partnerPurchaseInAmount);
|
625 |
LOGGER.info("partnerPurchaseInAmount" + partnerPurchaseInAmount);
|
| Line 670... |
Line 670... |
| 670 |
model.addAttribute("creditedIncome", creditedIncome);
|
670 |
model.addAttribute("creditedIncome", creditedIncome);
|
| 671 |
model.addAttribute("pendingTotalIncome", pendingTotalIncome);
|
671 |
model.addAttribute("pendingTotalIncome", pendingTotalIncome);
|
| 672 |
|
672 |
|
| 673 |
Map<Integer, String> monthValueMap = new HashMap<>();
|
673 |
Map<Integer, String> monthValueMap = new HashMap<>();
|
| 674 |
for (int i = 0; i <= 5; i++) {
|
674 |
for (int i = 0; i <= 5; i++) {
|
| 675 |
LocalDateTime startOfMonth = LocalDateTime.now().withDayOfMonth(1).minusMonths(i);
|
675 |
LocalDateTime monthStart = LocalDateTime.now().withDayOfMonth(1).minusMonths(i);
|
| 676 |
monthValueMap.put(i, startOfMonth.format(DateTimeFormatter.ofPattern("MMM''uu")));
|
676 |
monthValueMap.put(i, monthStart.format(DateTimeFormatter.ofPattern("MMM''uu")));
|
| 677 |
}
|
677 |
}
|
| 678 |
|
678 |
|
| 679 |
model.addAttribute("month", yearMonth);
|
679 |
model.addAttribute("month", yearMonth);
|
| 680 |
model.addAttribute("monthValueMap", monthValueMap);
|
680 |
model.addAttribute("monthValueMap", monthValueMap);
|
| 681 |
|
681 |
|