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

 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.springframework.transaction.annotation.Transactional;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
     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 {
-        LocalDateTime localDateTime = null;
+        LocalDateTime leadCreatedDateTime = null;
         if (leadDate != null) {
-            localDateTime = leadDate.atStartOfDay();
+            leadCreatedDateTime = leadDate.atStartOfDay();
+        }
-        LOGGER.info("localDateTime" + localDateTime);
+        LOGGER.info("localDateTime" + leadCreatedDateTime);
         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 (localDateTime == null) {
+            if (leadCreatedDateTime == 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, localDateTime);
+                    leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds, color, leadCreatedDateTime);
+                }
                 if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
                     leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
+            }
         } else {
-            if (localDateTime == null) {
+            if (leadCreatedDateTime == 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 twoYearsAgoYear = today.minusYears(2).getYear();
+                    LocalDateTime endLocalDate;
+                    if (leadCreatedDateTime.getYear() < twoYearsAgoYear) {
+                        // 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, localDateTime);
+//                    leads = leadRepository.selectAllByColorStatusAndCreatedTimestamp(leadStatus, color, leadCreatedDateTime);
+                    leads = leadRepository.selectAllByColorStatusAndBetweenDate(leadStatus, color, leadCreatedDateTime, endLocalDate);
+                }
                 if (leadStatus.contains(LeadStatus.followUp)) {
                     leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);

Subversion Repositories SmartDukaan

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