Subversion Repositories SmartDukaan

Rev

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

Rev 35746 Rev 35965
Line 1917... Line 1917...
1917 
                sdCreditService.settleBlockedLoan(transactionId, totalAmount);
 1917 
                sdCreditService.settleBlockedLoan(transactionId, totalAmount);
1918 
            }
 1918 
            }
1919 
        }
 1919 
        }
1920 
    }
 1920 
    }
1921 
 
 1921 
 
- 
 
 1922 
    @RequestMapping(value = "/transaction/bulkOrderApprovalReport", method = RequestMethod.GET)
- 
 
 1923 
    public String getBulkOrderApprovalReport(
- 
 
 1924 
            @RequestParam(required = false) String startDate,
- 
 
 1925 
            @RequestParam(required = false) String endDate,
- 
 
 1926 
            HttpServletRequest request, Model model) throws Exception {
- 
 
 1927 
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- 
 
 1928 
        LocalDate end = (endDate != null && !endDate.isEmpty()) ? LocalDate.parse(endDate, formatter) : LocalDate.now();
- 
 
 1929 
        LocalDate start = (startDate != null && !startDate.isEmpty()) ? LocalDate.parse(startDate, formatter) : end.minusDays(7);
- 
 
 1930 
        List<TransactionApprovalModel> approvalModelList = bulkOrderService.getBulkOrderApprovalReport(
- 
 
 1931 
                start.atStartOfDay(), end.plusDays(1).atStartOfDay());
- 
 
 1932 
        model.addAttribute("approvalModelList", approvalModelList);
- 
 
 1933 
        model.addAttribute("startDate", start.format(formatter));
- 
 
 1934 
        model.addAttribute("endDate", end.format(formatter));
- 
 
 1935 
        return "transaction/bulk-order-approval-report";
- 
 
 1936 
    }
- 
 
 1937 
 
1922 
    @RequestMapping(value = "/bulkOrderTemplate", method = RequestMethod.GET)
 1938 
    @RequestMapping(value = "/bulkOrderTemplate", method = RequestMethod.GET)
1923 
    public ResponseEntity<?> bulkOrderTemplate() throws Exception {
 1939 
    public ResponseEntity<?> bulkOrderTemplate() throws Exception {
1924 
        List<List<?>> rows = new ArrayList<>();
 1940 
        List<List<?>> rows = new ArrayList<>();
1925 
        rows.add(Arrays.asList("Mahaveer", "Change description for your reference", "175139287", "28264", "0", "4"));
 1941 
        rows.add(Arrays.asList("Mahaveer", "Change description for your reference", "175139287", "28264", "0", "4"));
1926 
        rows.add(Arrays.asList("Mahaveer", "Price =0 means system price", "175139287", "28268", "0", "7"));
 1942 
        rows.add(Arrays.asList("Mahaveer", "Price =0 means system price", "175139287", "28268", "0", "7"));