WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

     private RbmRatingRepository rbmRatingRepository;
     List<LeadStatus> status = Arrays.asList(LeadStatus.notInterested, LeadStatus.finalized);
     @RequestMapping(value = "/getOpenLead", method = RequestMethod.GET)
-    public String getOpenLead(HttpServletRequest request, @RequestParam(name = "leadStatus", required = false, defaultValue = "All") List<LeadStatus> leadStatus, @RequestParam(name = "color", required = false, defaultValue = "All") List<String> color, @RequestParam(name = "leadDate", required = false, defaultValue = "") LocalDate leadDate, Model model) throws Exception {
+    public String getOpenLead(HttpServletRequest request, @RequestParam(name = "leadStatus", required = false, defaultValue = "All") List<LeadStatus> leadStatus, @RequestParam(name = "color", required = false, defaultValue = "All") List<String> color, @RequestParam(name = "startDate", required = false) LocalDate startDate, @RequestParam(name = "endDate", required = false) LocalDate endDate, Model model) throws Exception {
-        LocalDateTime leadCreatedDateTime = null;
+        if (startDate != null && endDate != null) {
-        if (leadDate != null) {
+            if (java.time.Period.between(startDate, endDate).toTotalMonths() > 6) {
+                model.addAttribute("error", "Date range must not exceed 6 months");
-            leadCreatedDateTime = leadDate.atStartOfDay();
+                model.addAttribute("leads", new ArrayList<>());
+                return "lead";
+            }
+        }
+        LocalDateTime startDateTime = startDate != null ? startDate.atStartOfDay() : null;
+        LocalDateTime endDateTime = endDate != null ? endDate.atTime(23, 59, 59) : null;
-        LOGGER.info("localDateTime" + leadCreatedDateTime);
+        LOGGER.info("startDateTime: " + startDateTime + ", endDateTime: " + endDateTime);
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         String emailId = loginDetails.getEmailId();
         AuthUser authUser = authRepository.selectByEmailOrMobile(emailId);
             authUserIds.add(authUser.getId());
             LOGGER.info("authIds" + authUserIds);
             LOGGER.info("leadStatus" + leadStatus);
-            if (leadCreatedDateTime == null) {
+            if (startDateTime == null) {
                 if (!leadStatus.contains(LeadStatus.followUp)) {
                     leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds, color, LocalDateTime.now().minusMonths(1));
+                }
+                }
             } else {
                 if (!leadStatus.contains(LeadStatus.followUp)) {
-                    leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds, color, leadCreatedDateTime);
+                    leads = leadRepository.selectAllByColorStatusAndBetweenCreatedDateAndAuthIds(leadStatus, authUserIds, color, startDateTime, endDateTime);
+                }
                 if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
                     leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
+            }
         } else {
-            if (leadCreatedDateTime == null) {
+            if (startDateTime == null) {
                 if (!leadStatus.contains(LeadStatus.followUp)) {
                     leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, LocalDateTime.now().minusMonths(1));
+                }
                 if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
+                }
                 LOGGER.info("leadlocalDateTime1" + leads);
             } else {
                 if (!leadStatus.contains(LeadStatus.followUp)) {
-                    LocalDateTime today = LocalDate.now().atStartOfDay();
-                    int OneYearsAgoYear = today.minusYears(1).getYear();
-                    LocalDateTime endLocalDate;
-                    if (leadCreatedDateTime.getYear() < OneYearsAgoYear) {
-                        // End date = last day of created year (31 Dec 23:59:59)
-                        endLocalDate = leadCreatedDateTime
-                                .withMonth(12)
-                                .withDayOfMonth(31)
-                                .withHour(23)
-                                .withMinute(59)
-                                .withSecond(59);
-                    } else {
-                        // End date = today end of day
-                        endLocalDate = today
-                                .withHour(23)
-                                .withMinute(59)
-                                .withSecond(59);
-                    }
-//                    leads = leadRepository.selectAllByColorStatusAndCreatedTimestamp(leadStatus, color, leadCreatedDateTime);
-                    leads = leadRepository.selectAllByColorStatusAndBetweenDate(leadStatus, color, leadCreatedDateTime, endLocalDate);
+                    leads = leadRepository.selectAllByColorStatusAndBetweenCreatedDate(leadStatus, color, startDateTime, endDateTime);
+                }
                 if (leadStatus.contains(LeadStatus.followUp)) {
                     leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
         weekDates.add(curDate.minusDays(7).toLocalDate());
         LOGGER.info("lastDate" + lastDate);
         model.addAttribute("weekDates", weekDates);
+        model.addAttribute("startDate", startDate);
-        model.addAttribute("leadDate", leadDate);
+        model.addAttribute("endDate", endDate);
         model.addAttribute("lastDate", lastDate);
         model.addAttribute("stateNames", stateNames);
         model.addAttribute("communicationTypes", CommunicationType.values());
     @RequestMapping(value = "/downloadDateWiseLead", method = RequestMethod.GET)
     public ResponseEntity<?> getdownloadLeadDataByDate(HttpServletRequest request,
                                                        @RequestParam(name = "leadStatus", required = false, defaultValue = "All") List<LeadStatus> leadStatus,
                                                        @RequestParam(name = "color", required = false, defaultValue = "All") List<String> color,
+                                                       @RequestParam(name = "startDate", required = false) LocalDate startDate,
-                                                       @RequestParam(name = "leadDate", required = false, defaultValue = "") LocalDate leadDate) throws Exception {
+                                                       @RequestParam(name = "endDate", required = false) LocalDate endDate) throws Exception {
         LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
         String emailId = fofoDetails.getEmailId();
-        LocalDateTime localDateTime = null;
+        LocalDateTime startDateTime = startDate != null ? startDate.atStartOfDay() : null;
-        if (leadDate != null) {
-            localDateTime = leadDate.atStartOfDay();
+        LocalDateTime endDateTime = endDate != null ? endDate.atTime(23, 59, 59) : null;
-        }
         List<Lead> leads = new ArrayList<>();
         AuthUser authUser = authRepository.selectByEmailOrMobile(emailId);
         if (leadStatus.contains(LeadStatus.All)) {
             leadStatus.add(LeadStatus.pending);
         List<Lead> leadFollowUp = new ArrayList<>();
         if (authPositon) {
             authUserIds = authService.getAllReportees(authUser.getId());
             authUserIds.add(authUser.getId());
-            if (localDateTime == null) {
+            if (startDateTime == null) {
                 if (!leadStatus.contains(LeadStatus.followUp)) {
                     leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds, color, LocalDateTime.now().minusMonths(1));
+                }
                 if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
                     leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
                     leads.addAll(leadFollowUp);
+                }
             } else {
                 if (!leadStatus.contains(LeadStatus.followUp)) {
-                    leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds, color, localDateTime);
+                    leads = leadRepository.selectAllByColorStatusAndBetweenCreatedDateAndAuthIds(leadStatus, authUserIds, color, startDateTime, endDateTime);
+                }
                 if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
                     leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
                     leads.addAll(leadFollowUp);
+                }
+            }
         } else {
-            if (localDateTime == null) {
+            if (startDateTime == null) {
                 if (!leadStatus.contains(LeadStatus.followUp)) {
                     leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, LocalDateTime.now().minusMonths(1));
+                }
                 if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
                     leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
                     leads.addAll(leadFollowUp);
+                }
             } else {
-                /*if (!leadStatus.contains(LeadStatus.followUp)) {
+                if (!leadStatus.contains(LeadStatus.followUp)) {
-                    leads = leadRepository.selectAllByColorStatusAndCreatedTimestamp(leadStatus, color, localDateTime);
+                    leads = leadRepository.selectAllByColorStatusAndBetweenCreatedDate(leadStatus, color, startDateTime, endDateTime);
+                }
                 if (leadStatus.contains(LeadStatus.followUp)) {
                     leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
                     leads.addAll(leadFollowUp);
-                }*/
+                }
-                leads = leadRepository.selectAllByColorStatusAndCreatedTimestamp(leadStatus, color, localDateTime);
+            }
+        }
         // Build activity map and auth map (SAME AS VIEW ENDPOINT)
         if (!leads.isEmpty()) {
         leadActivityRepository.persist(leadActivity);
         lead.setAssignTo(createLeadActivityRequest.getAssignTo());
         lead.setStatus(createLeadActivityRequest.getStatus());
         lead.setState(createLeadActivityRequest.getState());
         lead.setCity(createLeadActivityRequest.getCity());
+        if (createLeadActivityRequest.getSource() != null && !createLeadActivityRequest.getSource().isEmpty()) {
+            lead.setSource(createLeadActivityRequest.getSource());
+        }
         if (createLeadActivityRequest.getColorCheck() == true) {
             lead.setColor("Green");
         } else {
             lead.setColor("Yellow");
+        }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LeadController.java – Rev 35579 → 35769