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

 package com.spice.profitmandi.web.controller;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.transaction.Transactional;
+import org.apache.commons.csv.CSVRecord;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.InputStreamResource;
+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.ui.Model;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
 import com.google.gson.Gson;
 import com.mongodb.DBObject;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
+import com.spice.profitmandi.common.model.CustomRetailer;
-import com.spice.profitmandi.common.model.*;
+import com.spice.profitmandi.common.model.Legend;
+import com.spice.profitmandi.common.model.OptionModel;
+import com.spice.profitmandi.common.model.PieLables;
+import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.util.FileUtil;
 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
+import com.spice.profitmandi.dao.entity.catalog.BrandCatalog;
 import com.spice.profitmandi.dao.entity.fofo.PartnerDailyInvestment;
+import com.spice.profitmandi.dao.entity.user.FranchiseeActivity;
+import com.spice.profitmandi.dao.entity.user.FranchiseeVisit;
-import com.spice.profitmandi.dao.entity.user.*;
+import com.spice.profitmandi.dao.entity.user.Lead;
+import com.spice.profitmandi.dao.entity.user.LeadActivity;
+import com.spice.profitmandi.dao.entity.user.LeadBrand;
+import com.spice.profitmandi.dao.entity.user.LeadDetail;
+import com.spice.profitmandi.dao.entity.user.VisitRequest;
 import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
 import com.spice.profitmandi.dao.enumuration.dtr.CommunicationType;
 import com.spice.profitmandi.dao.enumuration.dtr.LeadSource;
 import com.spice.profitmandi.dao.enumuration.dtr.LeadStatus;
+import com.spice.profitmandi.dao.model.ChartLeadModel;
+import com.spice.profitmandi.dao.model.CreateLeacdActivityRequest;
+import com.spice.profitmandi.dao.model.CreateRefferalRequest;
-import com.spice.profitmandi.dao.model.*;
+import com.spice.profitmandi.dao.model.DataLeadModel;
+import com.spice.profitmandi.dao.model.DateRangeModel;
+import com.spice.profitmandi.dao.model.LeadBrandModel;
+import com.spice.profitmandi.dao.model.LeadDetailModel;
+import com.spice.profitmandi.dao.model.LeadStatusData;
+import com.spice.profitmandi.dao.model.PartnerCollectionPlanModel;
+import com.spice.profitmandi.dao.model.RBMPerformanceSummaryModel;
+import com.spice.profitmandi.dao.model.TeamCommitmentModel;
+import com.spice.profitmandi.dao.model.TotalTargetColectionModel;
+import com.spice.profitmandi.dao.model.UserVisitModel;
+import com.spice.profitmandi.dao.model.VisitDescriptionModel;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
 import com.spice.profitmandi.dao.repository.auth.PartnerCollectionPlanRepository;
 import com.spice.profitmandi.dao.repository.auth.PartnerCollectionRemarkRepository;
 import com.spice.profitmandi.dao.repository.cs.CsService;
 import com.spice.profitmandi.dao.repository.cs.PositionRepository;
+import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
+import com.spice.profitmandi.dao.repository.dtr.FranchiseeActivityRepository;
+import com.spice.profitmandi.dao.repository.dtr.FranchiseeVisitRepository;
+import com.spice.profitmandi.dao.repository.dtr.LeadActivityRepository;
+import com.spice.profitmandi.dao.repository.dtr.LeadBrandRepository;
+import com.spice.profitmandi.dao.repository.dtr.LeadDetailRepository;
+import com.spice.profitmandi.dao.repository.dtr.LeadRepository;
-import com.spice.profitmandi.dao.repository.dtr.*;
+import com.spice.profitmandi.dao.repository.dtr.Mongo;
+import com.spice.profitmandi.dao.repository.dtr.VisitRequestRepository;
 import com.spice.profitmandi.dao.repository.fofo.PartnerDailyInvestmentRepository;
 import com.spice.profitmandi.dao.repository.inventory.StateRepository;
 import com.spice.profitmandi.dao.repository.transaction.UserWalletRepository;
 import com.spice.profitmandi.service.AuthService;
 import com.spice.profitmandi.service.PartnerCollectionService;
+import com.spice.profitmandi.service.catalog.BrandsService;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
 import com.spice.profitmandi.web.util.MVCResponseSender;
-import org.apache.commons.csv.CSVRecord;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.InputStreamResource;
-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.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 javax.transaction.Transactional;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
 @Controller
 @Transactional(rollbackOn = Throwable.class)
 public class LeadController {
-	private static final Logger LOGGER = LogManager.getLogger(LeadController.class);
+    private static final Logger LOGGER = LogManager.getLogger(LeadController.class);
+    @Autowired
+    private LeadRepository leadRepository;
+    @Autowired
+    private LeadActivityRepository leadActivityRepository;
+    @Autowired
+    private StateRepository stateRepository;
+    @Autowired
+    private AuthService authService;
+    @Autowired
+    private AuthRepository authRepository;
+    @Autowired
+    private Gson gson;
+    @Autowired
+    private CookiesProcessor cookiesProcessor;
+    @Autowired
+    PositionRepository positionRepository;
+    @Autowired
+    private MVCResponseSender mvcResponseSender;
+    @Autowired
+    private PartnerCollectionPlanRepository partnerCollectionPlanRepository;
+    @Autowired
+    private CsService csService;
+    @Autowired
+    private FofoStoreRepository fofoStoreRepository;
+    @Autowired
+    private PartnerCollectionService partnerCollectionService;
+    @Autowired
+    private RetailerService retailerService;
+    @Autowired
+    private PartnerCollectionRemarkRepository partnerCollectionRemarkRepository;
+    @Autowired
+    private PartnerDailyInvestmentRepository partnerDailyInvestmentRepository;
+    @Autowired
+    private UserWalletRepository userWalletRepository;
+    @Autowired
+    private FranchiseeVisitRepository franchiseeVisitRepository;
+    @Autowired
+    private FranchiseeActivityRepository franchiseeActivityRepository;
-	@Autowired
+    @Autowired
-	private LeadRepository leadRepository;
+    private VisitRequestRepository visitRequestRepository;
-	@Autowired
+    @Autowired
-	private LeadActivityRepository leadActivityRepository;
+    private LeadBrandRepository leadBrandRepository;
-	@Autowired
+    @Autowired
-	private StateRepository stateRepository;
+    private LeadDetailRepository leadDetailRepository;
-	@Autowired
+    @Autowired
-	private AuthService authService;
+    private Mongo mongoClient;
-	@Autowired
+    @Autowired
-	private AuthRepository authRepository;
+    private ResponseSender<?> responseSender;
-	@Autowired
+    @Autowired
-	private Gson gson;
+    private BrandsService brandsService;
-	@Autowired
-	private CookiesProcessor cookiesProcessor;
+    List<LeadStatus> status = Arrays.asList(LeadStatus.notInterested, LeadStatus.finalized);
-	@Autowired
+    @RequestMapping(value = "/getOpenLead", method = RequestMethod.GET)
-	PositionRepository positionRepository;
+    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;
+        if (leadDate != null) {
+            localDateTime = leadDate.atStartOfDay();
-	@Autowired
+        }
-	private MVCResponseSender mvcResponseSender;
+        LOGGER.info("localDateTime" + localDateTime);
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-	@Autowired
+        String emailId = loginDetails.getEmailId();
-	private PartnerCollectionPlanRepository partnerCollectionPlanRepository;
+        AuthUser authUser = authRepository.selectByEmailOrMobile(emailId);
-	@Autowired
-	private CsService csService;
+        boolean authPositon = positionRepository.hasCategory(authUser.getId(), ProfitMandiConstants.TICKET_CATEGORY_SALES);
-	@Autowired
-	private FofoStoreRepository fofoStoreRepository;
+        if (leadStatus.contains(LeadStatus.All)) {
-	@Autowired
+            leadStatus.add(LeadStatus.pending);
-	private PartnerCollectionService partnerCollectionService;
+            leadStatus.add(LeadStatus.notInterested);
+            leadStatus.add(LeadStatus.finalized);
+        }
+        if (color.contains("All")) {
-	@Autowired
+            color.add("yellow");
-	private RetailerService retailerService;
+            color.add("green");
+        }
-	@Autowired
-	private PartnerCollectionRemarkRepository partnerCollectionRemarkRepository;
+        List<Lead> leads = new ArrayList<>();
-	@Autowired
-	private PartnerDailyInvestmentRepository partnerDailyInvestmentRepository;
+        model.addAttribute("colors", color);
-	@Autowired
-	private UserWalletRepository userWalletRepository;
+        Map<Integer, List<LeadActivity>> leadActivityMap = new HashMap<>();
-	@Autowired
-	private FranchiseeVisitRepository franchiseeVisitRepository;
+        List<Integer> authUserIds = null;
-	@Autowired
-	private FranchiseeActivityRepository franchiseeActivityRepository;
+        LOGGER.info("color111" + color);
-	@Autowired
-	private VisitRequestRepository visitRequestRepository;
+        List<Lead> leadFollowUp = new ArrayList<>();
-	@Autowired
+        if (authPositon) {
+            authUserIds = authService.getAllReportees(authUser.getId());
-	private LeadBrandRepository leadBrandRepository;
+            authUserIds.add(authUser.getId());
+            LOGGER.info("authIds" + authUserIds);
-	@Autowired
-	private LeadDetailRepository leadDetailRepository;
+            LOGGER.info("leadStatus" + leadStatus);
-	@Autowired
-	private Mongo mongoClient;
+            if (localDateTime == null) {
-	@Autowired
-	private ResponseSender<?> responseSender;
+                if (!leadStatus.contains(LeadStatus.followUp)) {
-	List<LeadStatus> status = Arrays.asList(LeadStatus.notInterested, LeadStatus.finalized);
+                    leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds, color, LocalDateTime.now().minusMonths(1));
+                }
-	@RequestMapping(value = "/getOpenLead", method = RequestMethod.GET)
-	public String getOpenLead(HttpServletRequest request,
-			@RequestParam(name = "leadStatus", required = false, defaultValue = "All") List<LeadStatus> leadStatus,
+                if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
-			@RequestParam(name = "color", required = false, defaultValue = "All") List<String> color,
+                    leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
-			@RequestParam(name = "leadDate", required = false, defaultValue = "") LocalDate leadDate, Model model)
+                    leads.addAll(leadFollowUp);
-			throws Exception {
+                }
-		LocalDateTime localDateTime = null;
-		if (leadDate != null) {
+            } else {
-			localDateTime = leadDate.atStartOfDay();
-		}
-		LOGGER.info("localDateTime" + localDateTime);
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		String emailId = loginDetails.getEmailId();
-		AuthUser authUser = authRepository.selectByEmailOrMobile(emailId);
+                if (!leadStatus.contains(LeadStatus.followUp)) {
-		boolean authPositon = positionRepository.hasCategory(authUser.getId(),
+                    leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds, color, localDateTime);
-				ProfitMandiConstants.TICKET_CATEGORY_SALES);
+                }
-		if (leadStatus.contains(LeadStatus.All)) {
+                if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
-			leadStatus.add(LeadStatus.pending);
-			leadStatus.add(LeadStatus.notInterested);
-			leadStatus.add(LeadStatus.finalized);
+                    leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
-		}
-		if (color.contains("All")) {
-			color.add("yellow");
+                    leads.addAll(leadFollowUp);
-			color.add("green");
-		}
-		List<Lead> leads = new ArrayList<>();
+                }
-		model.addAttribute("colors", color);
+            }
-		Map<Integer, List<LeadActivity>> leadActivityMap = new HashMap<>();
+        } else {
-		List<Integer> authUserIds = null;
+            if (localDateTime == null) {
+                if (!leadStatus.contains(LeadStatus.followUp)) {
+                    leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, LocalDateTime.now().minusMonths(1));
-		LOGGER.info("color111" + color);
+                }
+                if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
-		List<Lead> leadFollowUp = new ArrayList<>();
+                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
-		if (authPositon) {
-			authUserIds = authService.getAllReportees(authUser.getId());
+                    leads.addAll(leadFollowUp);
-			authUserIds.add(authUser.getId());
+                }
-			LOGGER.info("authIds" + authUserIds);
+                LOGGER.info("leadlocalDateTime1" + leads);
+            } else {
-			LOGGER.info("leadStatus" + leadStatus);
+                if (!leadStatus.contains(LeadStatus.followUp)) {
+                    leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, localDateTime);
-			if (localDateTime == null) {
+                }
-				if (!leadStatus.contains(LeadStatus.followUp)) {
+                if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
-					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds,
+                    leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
-							color, LocalDateTime.now().minusMonths(1));
-				}
-				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
-					leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
-					leads.addAll(leadFollowUp);
+                    leads.addAll(leadFollowUp);
-				}
+                }
+                LOGGER.info("leadlocalDateTime2" + leads);
-			} else {
+            }
-				if (!leadStatus.contains(LeadStatus.followUp)) {
+        }
+        if (authPositon && authUserIds.size() > 0) {
+            List<String> leadCreators = new ArrayList<>();
+            leadCreators.add("daily-sync");
-					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestampAndAuthIds(leadStatus, authUserIds,
+            leadCreators.addAll(authRepository.selectAllAuthUserByIds(authUserIds).stream().map(x -> x.getFullName()).collect(Collectors.toList()));
-							color, localDateTime);
+            model.addAttribute("leadCreators", leadCreators);
-				}
+        }
+        List<Lead> weekLast = new ArrayList<>();
+        List<Lead> weekThird = new ArrayList<>();
+        List<Lead> weekSecond = new ArrayList<>();
+        List<Lead> weekFirst = new ArrayList<>();
+        LocalDateTime curDate = LocalDate.now().atStartOfDay();
+        List<LeadWeakWiseModel> lwDays = new ArrayList<>();
+        for (int i = 7; i >= 1; i--) {
-				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
+            LocalDateTime startOfDay = curDate.minusDays(i);
-					leadFollowUp = leadRepository.selectByAssignAuthIdsAndStatus(authUserIds, LeadStatus.followUp);
+            LeadWeakWiseModel lm = new LeadWeakWiseModel();
+            lm.setMonth(startOfDay.toLocalDate());
+            lwDays.add(lm);
+        }
+        if (!leads.isEmpty()) {
-					leads.addAll(leadFollowUp);
+            weekLast.addAll(
+                    leads.stream().filter(x -> x.getCreatedTimestamp().isAfter(curDate.minusDays(28)) && x.getCreatedTimestamp().isBefore(curDate.minusDays(21))).collect(Collectors.toList()));
-				}
+            weekThird.addAll(leads.stream().filter(x -> x.getCreatedTimestamp().isAfter(curDate.minusDays(21)) && x.getCreatedTimestamp().isBefore(curDate.minusDays(14))).collect(Collectors.toList()));
-			}
+            weekSecond.addAll(leads.stream().filter(x -> x.getCreatedTimestamp().isAfter(curDate.minusDays(14)) && x.getCreatedTimestamp().isBefore(curDate.minusDays(7))).collect(Collectors.toList()));
-		} else {
+            weekFirst.addAll(leads.stream().filter(x -> x.getCreatedTimestamp().isAfter(curDate.minusDays(7))).collect(Collectors.toList()));
+        }
+        LOGGER.info("weekLast" + weekLast);
-			if (localDateTime == null) {
+        LOGGER.info("weekThird" + weekThird);
-				if (!leadStatus.contains(LeadStatus.followUp)) {
+        LOGGER.info("weekSecond" + weekSecond);
+        Map<String, Long> leadLasts = weekLast.stream().collect(Collectors.groupingBy(x -> x.getCreatedBy(), Collectors.counting()));
+        Map<String, Long> leadThirds = weekThird.stream().collect(Collectors.groupingBy(x -> x.getCreatedBy(), Collectors.counting()));
+        Map<String, Long> leadSeconds = weekSecond.stream().collect(Collectors.groupingBy(x -> x.getCreatedBy(), Collectors.mapping(Lead::getCreatedBy, Collectors.counting())));
-					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color,
+        Map<String, Map<LocalDate, Long>> leadFirsts = weekFirst.stream().collect(Collectors.groupingBy(x -> x.getCreatedBy(), Collectors.groupingBy(x -> x.getCreatedTimestamp().toLocalDate(), Collectors.counting())));
-							LocalDateTime.now().minusMonths(1));
-				}
-				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
-					leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
+        LOGGER.info("leadFirsts" + leadFirsts);
-					leads.addAll(leadFollowUp);
+        List<Integer> authIds = new ArrayList<>();
-				}
-				LOGGER.info("leadlocalDateTime1" + leads);
+        if (!leads.isEmpty()) {
-			} else {
-				if (!leadStatus.contains(LeadStatus.followUp)) {
+            authIds.addAll(leads.stream().map(x -> x.getAssignTo()).collect(Collectors.toList()));
-					leads = leadRepository.selectAllByColorStatusAndUpdatedTimestamp(leadStatus, color, localDateTime);
+            leadActivityMap = leadActivityRepository.selectAllByleadIds(leads.stream().map(x -> x.getId()).collect(Collectors.toList())).stream().collect(Collectors.groupingBy(LeadActivity::getLeadId, Collectors.toList()));
-				}
+            Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
-				if (leadStatus.contains(LeadStatus.followUp) || leadStatus.contains(LeadStatus.All)) {
+            model.addAttribute("leadActivityMap", leadActivityMap);
+            model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
+        }
+        ChartLeadModel cm = this.getLeadChart(leads);
-					leadFollowUp = leadRepository.selectAllByStatus(LeadStatus.followUp);
+        model.addAttribute("chartLead", gson.toJson(cm));
-					leads.addAll(leadFollowUp);
+        LOGGER.info("ChartLeadModel" + gson.toJson(cm));
-				}
-				LOGGER.info("leadlocalDateTime2" + leads);
+        LOGGER.info("lwDays" + lwDays);
-			}
+        LOGGER.info("leads" + leads);
+        List<String> stateNames = stateRepository.selectAll().stream().map(x -> x.getName()).collect(Collectors.toList());
+        List<AuthUser> authUsers = authRepository.selectAllActiveUser();
+        LocalDate lastDate = curDate.minusDays(1).toLocalDate();
-		}
+        List<LocalDate> weekDates = new ArrayList<>();
-		if (authPositon && authUserIds.size() > 0) {
+        weekDates.add(curDate.minusDays(28).toLocalDate());
-			List<String> leadCreators = new ArrayList<>();
+        weekDates.add(curDate.minusDays(22).toLocalDate());
-			leadCreators.add("daily-sync");
+        weekDates.add(curDate.minusDays(21).toLocalDate());
-			leadCreators.addAll(authRepository.selectAllAuthUserByIds(authUserIds).stream().map(x -> x.getFullName())
-					.collect(Collectors.toList()));
+        weekDates.add(curDate.minusDays(15).toLocalDate());
-			model.addAttribute("leadCreators", leadCreators);
+        weekDates.add(curDate.minusDays(14).toLocalDate());
-		}
-		List<Lead> weekLast = new ArrayList<>();
-		List<Lead> weekThird = new ArrayList<>();
-		List<Lead> weekSecond = new ArrayList<>();
+        weekDates.add(curDate.minusDays(8).toLocalDate());
-		List<Lead> weekFirst = new ArrayList<>();
-		LocalDateTime curDate = LocalDate.now().atStartOfDay();
+        weekDates.add(curDate.minusDays(7).toLocalDate());
-		List<LeadWeakWiseModel> lwDays = new ArrayList<>();
+        LOGGER.info("lastDate" + lastDate);
-		for (int i = 7; i >= 1; i--) {
-			LocalDateTime startOfDay = curDate.minusDays(i);
+        model.addAttribute("weekDates", weekDates);
-			LeadWeakWiseModel lm = new LeadWeakWiseModel();
+        model.addAttribute("leadDate", leadDate);
-			lm.setMonth(startOfDay.toLocalDate());
+        model.addAttribute("lastDate", lastDate);
-			lwDays.add(lm);
-		}
-		if (!leads.isEmpty()) {
+        model.addAttribute("stateNames", stateNames);
-			weekLast.addAll(
-					leads.stream()
-							.filter(x -> x.getCreatedTimestamp().isAfter(curDate.minusDays(28))
-									&& x.getCreatedTimestamp().isBefore(curDate.minusDays(21)))
+        model.addAttribute("communicationTypes", CommunicationType.values());
-							.collect(Collectors.toList()));
-			weekThird
+        model.addAttribute("authUsers", authUsers);
-					.addAll(leads.stream()
+        model.addAttribute("lead", leads);
-							.filter(x -> x.getCreatedTimestamp().isAfter(curDate.minusDays(21))
+        model.addAttribute("leadStatus", LeadStatus.values());
+        model.addAttribute("leadLasts", leadLasts);
+        model.addAttribute("leadThirds", leadThirds);
+        model.addAttribute("leadSeconds", leadSeconds);
-									&& x.getCreatedTimestamp().isBefore(curDate.minusDays(14)))
+        model.addAttribute("leadFirsts", leadFirsts);
-							.collect(Collectors.toList()));
+        model.addAttribute("lwDays", lwDays);
-			weekSecond
-					.addAll(leads.stream()
-							.filter(x -> x.getCreatedTimestamp().isAfter(curDate.minusDays(14))
-									&& x.getCreatedTimestamp().isBefore(curDate.minusDays(7)))
+        model.addAttribute("selectedLeadStatus", leadStatus.get(0));
-							.collect(Collectors.toList()));
-			weekFirst.addAll(leads.stream().filter(x -> x.getCreatedTimestamp().isAfter(curDate.minusDays(7)))
-					.collect(Collectors.toList()));
-		}
-		LOGGER.info("weekLast" + weekLast);
-		LOGGER.info("weekThird" + weekThird);
-		LOGGER.info("weekSecond" + weekSecond);
-		Map<String, Long> leadLasts = weekLast.stream()
-				.collect(Collectors.groupingBy(x -> x.getCreatedBy(), Collectors.counting()));
+        List<BrandCatalog> brandsDisplays = brandsService.getBrandsToDisplay(3);
-		Map<String, Long> leadThirds = weekThird.stream()
+        brandsDisplays.addAll(brandsService.getBrandsToDisplay(6));
-				.collect(Collectors.groupingBy(x -> x.getCreatedBy(), Collectors.counting()));
+        model.addAttribute("brandsDisplays", brandsDisplays.stream().distinct().collect(Collectors.toList()));
-		Map<String, Long> leadSeconds = weekSecond.stream().collect(Collectors.groupingBy(x -> x.getCreatedBy(),
-				Collectors.mapping(Lead::getCreatedBy, Collectors.counting())));
-		Map<String, Map<LocalDate, Long>> leadFirsts = weekFirst.stream()
-				.collect(Collectors.groupingBy(x -> x.getCreatedBy(),
+        LOGGER.info("brandsDisplays" + brandsDisplays);
-						Collectors.groupingBy(x -> x.getCreatedTimestamp().toLocalDate(), Collectors.counting())));
-		LOGGER.info("leadFirsts" + leadFirsts);
-		List<Integer> authIds = new ArrayList<>();
-		if (!leads.isEmpty()) {
+        return "lead";
-			authIds.addAll(leads.stream().map(x -> x.getAssignTo()).collect(Collectors.toList()));
+    }
-			leadActivityMap = leadActivityRepository
-					.selectAllByleadIds(leads.stream().map(x -> x.getId()).collect(Collectors.toList())).stream()
+    public ChartLeadModel getLeadChart(List<Lead> leads) throws ProfitMandiBusinessException {
-					.collect(Collectors.groupingBy(LeadActivity::getLeadId, Collectors.toList()));
-			Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream()
-					.collect(Collectors.toMap(x -> x.getId(), x -> x));
-			model.addAttribute("leadActivityMap", leadActivityMap);
+        Map<LeadStatus, Long> leadStatusMap = leads.stream().collect(
-			model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
+                Collectors.groupingBy(x -> x.getStatus(), Collectors.mapping(Lead::getStatus, Collectors.counting())));
-		}
-		ChartLeadModel cm = this.getLeadChart(leads);
+        Map<String, Long> hotLeadsMap = leads.stream().collect(
-		model.addAttribute("chartLead", gson.toJson(cm));
+                Collectors.groupingBy(x -> x.getColor(), Collectors.mapping(Lead::getColor, Collectors.counting())));
-		LOGGER.info("ChartLeadModel" + gson.toJson(cm));
+        LOGGER.info("hotLeadsMap" + hotLeadsMap);
-		LOGGER.info("lwDays" + lwDays);
+        ChartLeadModel cm = new ChartLeadModel();
-		LOGGER.info("leads" + leads);
-		List<String> stateNames = stateRepository.selectAll().stream().map(x -> x.getName())
-				.collect(Collectors.toList());
-		List<AuthUser> authUsers = authRepository.selectAllActiveUser();
+        HashSet<LeadStatus> labels = new HashSet<LeadStatus>();
-		LocalDate lastDate = curDate.minusDays(1).toLocalDate();
+        labels.addAll(leadStatusMap.keySet());
-		List<LocalDate> weekDates = new ArrayList<>();
+        List<String> hotLeads = new ArrayList<>();
+        hotLeads.addAll(leadStatusMap.keySet().stream().map(x -> x.toString()).collect(Collectors.toSet()));
+        hotLeads.add("HotLead");
-		weekDates.add(curDate.minusDays(28).toLocalDate());
-		weekDates.add(curDate.minusDays(22).toLocalDate());
-		weekDates.add(curDate.minusDays(21).toLocalDate());
-		weekDates.add(curDate.minusDays(15).toLocalDate());
-		weekDates.add(curDate.minusDays(14).toLocalDate());
+        List<String> hotLeadKeys = new ArrayList<>();
-		weekDates.add(curDate.minusDays(8).toLocalDate());
-		weekDates.add(curDate.minusDays(7).toLocalDate());
-		LOGGER.info("lastDate" + lastDate);
-		model.addAttribute("weekDates", weekDates);
+        hotLeadKeys.add("HotLead");
+        List<String> hotLeadGreen = new ArrayList<>(hotLeadKeys);
-		model.addAttribute("leadDate", leadDate);
-		model.addAttribute("lastDate", lastDate);
-		model.addAttribute("stateNames", stateNames);
+        LOGGER.info("hotLeads" + hotLeads);
-		model.addAttribute("communicationTypes", CommunicationType.values());
+        List<LeadStatus> labelList = new ArrayList<>(labels);
+        List<String> backgroundColor = new ArrayList<>();
+        LOGGER.info("hotLeadKeys" + hotLeadKeys);
+        List<Long> values = new ArrayList<>();
-		model.addAttribute("authUsers", authUsers);
-		model.addAttribute("lead", leads);
+        for (String hotLead : hotLeads) {
-		model.addAttribute("leadStatus", LeadStatus.values());
-		model.addAttribute("leadLasts", leadLasts);
-		model.addAttribute("leadThirds", leadThirds);
-		model.addAttribute("leadSeconds", leadSeconds);
-		model.addAttribute("leadFirsts", leadFirsts);
-		model.addAttribute("lwDays", lwDays);
+            if (hotLead.equals("pending")) {
+                backgroundColor.add("pink");
-		model.addAttribute("selectedLeadStatus", leadStatus.get(0));
+                values.add(leadStatusMap.get(LeadStatus.pending));
+            }
+            if (hotLead.equals("notInterested")) {
+                backgroundColor.add("red");
+                values.add(leadStatusMap.get(LeadStatus.notInterested));
+            }
+            if (hotLead.equals("followUp")) {
+                backgroundColor.add("#9ACD32");
+                values.add(leadStatusMap.get(LeadStatus.followUp));
+            }
+            if (hotLead.equals("finalized")) {
+                backgroundColor.add("blue");
+                values.add(leadStatusMap.get(LeadStatus.finalized));
+            }
+            if (hotLead.equals("HotLead")) {
+                backgroundColor.add("green");
-		List<DBObject> mobileBrands = mongoClient.getAllBrandsToDisplay(3);
+                values.add(hotLeadsMap.get("Green"));
-		List<String> brands = mobileBrands.stream().map(x -> (String) x.get("name")).collect(Collectors.toList());
+            }
+        }
-		model.addAttribute("brands", brands);
+        LOGGER.info("labelList" + labelList);
+        LOGGER.info("backgroundColor" + backgroundColor);
+        LOGGER.info("labelsChartLead" + labels);
+        LeadStatusData data = new LeadStatusData();
-		return "lead";
+        data.setData(values);
+        data.setBackgroundColor(backgroundColor);
+        data.setLabel("DataSet 1");
-	}
+        PieLables label = new PieLables();
+        label.setFontColor("black");
+        label.setFontSize(15);
+        Legend legend = new Legend();
+        legend.setLabels(label);
-	public ChartLeadModel getLeadChart(List<Lead> leads) throws ProfitMandiBusinessException {
+        legend.setPosition("left");
-		Map<LeadStatus, Long> leadStatusMap = leads.stream().collect(
+        List<LeadStatusData> dataList = new ArrayList<>();
-				Collectors.groupingBy(x -> x.getStatus(), Collectors.mapping(Lead::getStatus, Collectors.counting())));
+        dataList.add(data);
-		Map<String, Long> hotLeadsMap = leads.stream().collect(
+        DataLeadModel datasets = new DataLeadModel();
-				Collectors.groupingBy(x -> x.getColor(), Collectors.mapping(Lead::getColor, Collectors.counting())));
+        datasets.setDatasets(dataList);
+        datasets.setLabels(hotLeads);
-		LOGGER.info("hotLeadsMap" + hotLeadsMap);
+        OptionModel om = new OptionModel();
-		ChartLeadModel cm = new ChartLeadModel();
+        om.setLegend(legend);
-		HashSet<LeadStatus> labels = new HashSet<LeadStatus>();
+        cm.setType("pie");
-		labels.addAll(leadStatusMap.keySet());
+        cm.setData(datasets);
+        cm.setOptions(om);
-		List<String> hotLeads = new ArrayList<>();
-		hotLeads.addAll(leadStatusMap.keySet().stream().map(x -> x.toString()).collect(Collectors.toSet()));
-		hotLeads.add("HotLead");
+        return cm;
+    }
-		List<String> hotLeadKeys = new ArrayList<>();
+    @RequestMapping(value = "/getClosedLead", method = RequestMethod.GET)
-		hotLeadKeys.add("HotLead");
+    public String getClosedLead(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, @RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model) throws Exception {
-		List<String> hotLeadGreen = new ArrayList<>(hotLeadKeys);
+        List<AuthUser> authUsers = authRepository.selectAllActiveUser();
+        List<Lead> leads = null;
+        long size = 0;
+        leads = leadRepository.selectAllByStatus(status, offset, limit);
+        size = leadRepository.selectCountByStatus(status);
+        if (!leads.isEmpty()) {
+            List<Integer> authIds = new ArrayList<>();
-		LOGGER.info("hotLeads" + hotLeads);
+            for (Lead lead : leads) {
+                authIds.add(lead.getAssignTo());
+            }
+            Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
-		List<LeadStatus> labelList = new ArrayList<>(labels);
+            model.addAttribute("leads", leads);
-		List<String> backgroundColor = new ArrayList<>();
+            model.addAttribute("start", offset + 1);
-		LOGGER.info("hotLeadKeys" + hotLeadKeys);
+            model.addAttribute("size", size);
-		List<Long> values = new ArrayList<>();
+            model.addAttribute("searchTerm", searchTerm);
+            model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
+            model.addAttribute("url", "/getPaginatedClosedLeads");
-		for (String hotLead : hotLeads) {
+            if (leads.size() < limit) {
+                model.addAttribute("end", offset + leads.size());
+            } else {
+                model.addAttribute("end", offset + limit);
+            }
-			if (hotLead.equals("pending")) {
+        } else {
-				backgroundColor.add("pink");
-				values.add(leadStatusMap.get(LeadStatus.pending));
+            model.addAttribute("lead", leads);
-			}
-			if (hotLead.equals("notInterested")) {
-				backgroundColor.add("red");
-				values.add(leadStatusMap.get(LeadStatus.notInterested));
-			}
-			if (hotLead.equals("followUp")) {
-				backgroundColor.add("#9ACD32");
-				values.add(leadStatusMap.get(LeadStatus.followUp));
-			}
-			if (hotLead.equals("finalized")) {
-				backgroundColor.add("blue");
-				values.add(leadStatusMap.get(LeadStatus.finalized));
-			}
-			if (hotLead.equals("HotLead")) {
+            model.addAttribute("size", size);
-				backgroundColor.add("green");
+        }
-				values.add(hotLeadsMap.get("Green"));
+        model.addAttribute("authUsers", authUsers);
+        return "lead-close";
-			}
+    }
-		}
+    @RequestMapping(value = "/getPaginatedClosedLeads", method = RequestMethod.GET)
+    public String getPaginatedClosedLeads(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws ProfitMandiBusinessException {
-		LOGGER.info("labelList" + labelList);
+        List<Lead> leads = null;
+        leads = leadRepository.selectAllByStatus(status, offset, limit);
+        if (!leads.isEmpty()) {
-		LOGGER.info("backgroundColor" + backgroundColor);
+            List<Integer> authIds = new ArrayList<>();
-		LOGGER.info("labelsChartLead" + labels);
+            for (Lead lead : leads) {
-		LeadStatusData data = new LeadStatusData();
+                authIds.add(lead.getAssignTo());
-		data.setData(values);
+            }
+            Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
+            model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
-		data.setBackgroundColor(backgroundColor);
+            model.addAttribute("leads", leads);
-		data.setLabel("DataSet 1");
+            model.addAttribute("url", "/getPaginatedClosedLeads");
-		PieLables label = new PieLables();
+        } else {
-		label.setFontColor("black");
+            model.addAttribute("leads", leads);
-		label.setFontSize(15);
-		Legend legend = new Legend();
+        }
-		legend.setLabels(label);
+        return "lead-close-paginated";
-		legend.setPosition("left");
+    }
+    @RequestMapping(value = "/searchLeads")
-		List<LeadStatusData> dataList = new ArrayList<>();
+    public String getClosedLeads(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, @RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model) throws ProfitMandiBusinessException {
+        List<AuthUser> authUsers = authRepository.selectAllActiveUser();
-		dataList.add(data);
+        List<Lead> leads = null;
+        long size = 0;
+        if (!(searchTerm.equals(""))) {
+            leads = leadRepository.selectBySearchTerm(status, searchTerm, offset, limit);
+            if (!(leads.size() == 0)) {
+                size = leadRepository.selectCountByStatus(status);
+                List<Integer> authIds = new ArrayList<>();
+                for (Lead lead : leads) {
+                    authIds.add(lead.getAssignTo());
+                }
+                Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
+                model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
+                model.addAttribute("leads", leads);
+                model.addAttribute("start", offset + 1);
+                model.addAttribute("size", size);
+                model.addAttribute("searchTerm", searchTerm);
+                if (leads.size() < limit) {
-		DataLeadModel datasets = new DataLeadModel();
+                    model.addAttribute("end", offset + leads.size());
-		datasets.setDatasets(dataList);
+                } else {
+                    model.addAttribute("end", offset + limit);
+                }
-		datasets.setLabels(hotLeads);
+            } else {
+                throw new ProfitMandiBusinessException("lead", searchTerm, "leads Not Found");
+            }
+        } else {
+            leads = leadRepository.selectAllByStatus(status, offset, limit);
+            size = leadRepository.selectCountByStatus(status);
-		OptionModel om = new OptionModel();
+            if (!leads.isEmpty()) {
+                List<Integer> authIds = new ArrayList<>();
-		om.setLegend(legend);
+                for (Lead lead : leads) {
+                    authIds.add(lead.getAssignTo());
+                }
+                Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
-		cm.setType("pie");
+                model.addAttribute("leads", leads);
-		cm.setData(datasets);
+                model.addAttribute("start", offset + 1);
-		cm.setOptions(om);
+                model.addAttribute("size", size);
+                model.addAttribute("searchTerm", searchTerm);
+                model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
+                if (leads.size() < limit) {
+                    model.addAttribute("end", offset + leads.size());
-		return cm;
+                } else {
+                    model.addAttribute("end", offset + limit);
-	}
+                }
-	@RequestMapping(value = "/getClosedLead", method = RequestMethod.GET)
-	public String getClosedLead(HttpServletRequest request,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit,
-			@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
-			throws Exception {
+            }
-		List<AuthUser> authUsers = authRepository.selectAllActiveUser();
-		List<Lead> leads = null;
-		long size = 0;
+        }
-		leads = leadRepository.selectAllByStatus(status, offset, limit);
-		size = leadRepository.selectCountByStatus(status);
-		if (!leads.isEmpty()) {
-			List<Integer> authIds = new ArrayList<>();
+        model.addAttribute("authUsers", authUsers);
-			for (Lead lead : leads) {
+        return "lead-close";
-				authIds.add(lead.getAssignTo());
-			}
+    }
-			Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream()
-					.collect(Collectors.toMap(x -> x.getId(), x -> x));
+    @RequestMapping(value = "/searchLeadPaginated")
-			model.addAttribute("leads", leads);
+    public String searchLeadPaginated(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, @RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model) throws ProfitMandiBusinessException {
-			model.addAttribute("start", offset + 1);
+        LOGGER.info("In search Item....");
-			model.addAttribute("size", size);
+        List<Lead> leads = null;
-			model.addAttribute("searchTerm", searchTerm);
+        if (!searchTerm.equals("")) {
-			model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
+            leads = leadRepository.selectBySearchTerm(status, searchTerm, offset, limit);
-			model.addAttribute("url", "/getPaginatedClosedLeads");
+            if (!(leads.size() == 0)) {
+                List<Integer> authIds = new ArrayList<>();
-			if (leads.size() < limit) {
+                for (Lead lead : leads) {
-				model.addAttribute("end", offset + leads.size());
+                    authIds.add(lead.getAssignTo());
-			} else {
+                }
+                Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
+                model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
-				model.addAttribute("end", offset + limit);
+                model.addAttribute("leads", leads);
+            }
-			}
+        }
-		} else {
-			model.addAttribute("lead", leads);
+        return "lead-close-paginated";
-			model.addAttribute("size", size);
-		}
+    }
-		model.addAttribute("authUsers", authUsers);
+    @RequestMapping(value = "/getLeadActivity", method = RequestMethod.GET)
+    public String getLeadActivity(HttpServletRequest request, @RequestParam int leadId, Model model) throws Exception {
-		return "lead-close";
+        List<LeadActivity> leadActivity = leadActivityRepository.selectBYLeadId(leadId);
-	}
-	@RequestMapping(value = "/getPaginatedClosedLeads", method = RequestMethod.GET)
-	public String getPaginatedClosedLeads(HttpServletRequest request,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
-			throws ProfitMandiBusinessException {
-		List<Lead> leads = null;
-		leads = leadRepository.selectAllByStatus(status, offset, limit);
+        LOGGER.info("leadActivity" + leadActivity);
-		if (!leads.isEmpty()) {
-			List<Integer> authIds = new ArrayList<>();
-			for (Lead lead : leads) {
-				authIds.add(lead.getAssignTo());
-			}
-			Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream()
-					.collect(Collectors.toMap(x -> x.getId(), x -> x));
-			model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
-			model.addAttribute("leads", leads);
+        model.addAttribute("leadActivity", leadActivity);
-			model.addAttribute("url", "/getPaginatedClosedLeads");
+        model.addAttribute("authUserMap", authRepository.selectAllActiveUser().stream().collect(Collectors.toMap(x -> x.getId(), x -> x)));
+        return "lead_activity_modal";
-		} else {
+    }
-			model.addAttribute("leads", leads);
-		}
+    @RequestMapping(value = "/getLead", method = RequestMethod.GET)
+    public ResponseEntity<?> getLead(HttpServletRequest request, @RequestParam int leadId) throws Exception {
-		return "lead-close-paginated";
+        Lead lead = leadRepository.selectById(leadId);
-	}
-	@RequestMapping(value = "/searchLeads")
-	public String getClosedLeads(HttpServletRequest request,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit,
-			@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
-			throws ProfitMandiBusinessException {
-		List<AuthUser> authUsers = authRepository.selectAllActiveUser();
+        LeadDetail leadDetail = leadDetailRepository.selectByLeadId(lead.getId());
-		List<Lead> leads = null;
-		long size = 0;
-		if (!(searchTerm.equals(""))) {
-			leads = leadRepository.selectBySearchTerm(status, searchTerm, offset, limit);
-			if (!(leads.size() == 0)) {
+        if (leadDetail != null) {
-				size = leadRepository.selectCountByStatus(status);
+            lead.setOutLetName(leadDetail.getOutletName());
-				List<Integer> authIds = new ArrayList<>();
-				for (Lead lead : leads) {
-					authIds.add(lead.getAssignTo());
-				}
+        }
-				Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream()
-						.collect(Collectors.toMap(x -> x.getId(), x -> x));
-				model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
-				model.addAttribute("leads", leads);
-				model.addAttribute("start", offset + 1);
-				model.addAttribute("size", size);
-				model.addAttribute("searchTerm", searchTerm);
-				if (leads.size() < limit) {
-					model.addAttribute("end", offset + leads.size());
-				} else {
-					model.addAttribute("end", offset + limit);
-				}
-			} else {
-				throw new ProfitMandiBusinessException("lead", searchTerm, "leads Not Found");
-			}
-		} else {
-			leads = leadRepository.selectAllByStatus(status, offset, limit);
-			size = leadRepository.selectCountByStatus(status);
+        return responseSender.ok(lead);
-			if (!leads.isEmpty()) {
-				List<Integer> authIds = new ArrayList<>();
-				for (Lead lead : leads) {
-					authIds.add(lead.getAssignTo());
-				}
+    }
-				Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream()
-						.collect(Collectors.toMap(x -> x.getId(), x -> x));
-				model.addAttribute("leads", leads);
-				model.addAttribute("start", offset + 1);
+    @RequestMapping(value = "/createLead", method = RequestMethod.POST)
-				model.addAttribute("size", size);
-				model.addAttribute("searchTerm", searchTerm);
+    public String CreateLead(HttpServletRequest request, @RequestBody CreateRefferalRequest createRefferalRequest, Model model) throws Exception {
-				model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        LOGGER.info("createRefferalRequest" + createRefferalRequest.getSchelduleTimestamp());
-				if (leads.size() < limit) {
+        Lead lead = new Lead();
+        lead.setFirstName(createRefferalRequest.getFirstName());
+        lead.setLastName(createRefferalRequest.getLastName());
+        lead.setLeadMobile(createRefferalRequest.getMobile());
+        lead.setState(createRefferalRequest.getState());
-					model.addAttribute("end", offset + leads.size());
+        lead.setCity(createRefferalRequest.getCity());
+        lead.setAddress(createRefferalRequest.getAddress());
+        lead.setCreatedTimestamp(LocalDateTime.now());
+        lead.setUpdatedTimestamp(LocalDateTime.now());
+        lead.setStatus(createRefferalRequest.getStatus());
+        lead.setAssignTo(createRefferalRequest.getAssignTo());
+        lead.setSource(createRefferalRequest.getSource());
+        lead.setColor("yellow");
-				} else {
+        // change
+        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+        String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
+        lead.setCreatedBy(authUserName);
+        lead.setAuthId(authUser.getId());
+        LOGGER.info("lead --- {}", lead);
+        leadRepository.persist(lead);
+        LeadActivity leadActivity = new LeadActivity();
-					model.addAttribute("end", offset + limit);
+        leadActivity.setLeadId(lead.getId());
-				}
+        leadActivity.setRemark(createRefferalRequest.getRemark());
+        leadActivity.setAuthId(authUser.getId());
+        LOGGER.info("createRefferalRequest" + createRefferalRequest.getCommunicationType());
-			}
-		}
+        if (createRefferalRequest.getStatus() == LeadStatus.followUp) {
+            leadActivity.setSchelduleTimestamp(createRefferalRequest.getSchelduleTimestamp());
+            leadActivity.setCommunicationType(createRefferalRequest.getCommunicationType());
-		model.addAttribute("authUsers", authUsers);
+            if (leadActivity.getCommunicationType().equals(CommunicationType.VISIT)) {
+                visitRequestRepository.createVisitRequest(lead.getId(), "lead", lead.getAssignTo(), createRefferalRequest.getSchelduleTimestamp());
+            }
-		return "lead-close";
+        } else {
+            leadActivity.setSchelduleTimestamp(null);
-	}
+        }
+        leadActivity.setCreatedTimestamp(LocalDateTime.now());
+        leadActivityRepository.persist(leadActivity);
-	@RequestMapping(value = "/searchLeadPaginated")
+        LeadDetailModel leadDetail = new LeadDetailModel();
-	public String searchLeadPaginated(HttpServletRequest request,
+        leadDetail.setLeadId(lead.getId());
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit,
+        leadDetail.setOutletName(createRefferalRequest.getOutletName());
-			@RequestParam(name = "searchTerm", required = false, defaultValue = "") String searchTerm, Model model)
-			throws ProfitMandiBusinessException {
-		LOGGER.info("In search Item....");
-		List<Lead> leads = null;
-		if (!searchTerm.equals("")) {
-			leads = leadRepository.selectBySearchTerm(status, searchTerm, offset, limit);
+        leadDetail.setCounterSize(createRefferalRequest.getCounterSize());
-			if (!(leads.size() == 0)) {
-				List<Integer> authIds = new ArrayList<>();
-				for (Lead lead : leads) {
-					authIds.add(lead.getAssignTo());
-				}
-				Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllAuthUserByIds(authIds).stream()
-						.collect(Collectors.toMap(x -> x.getId(), x -> x));
-				model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
-				model.addAttribute("leads", leads);
-			}
-		}
-		return "lead-close-paginated";
+        leadDetail.setFrontp(createRefferalRequest.getFrontp());
+        leadDetail.setFrontWithMarket(createRefferalRequest.getFrontWithMarket());
-	}
-	@RequestMapping(value = "/getLeadActivity", method = RequestMethod.GET)
-	public String getLeadActivity(HttpServletRequest request, @RequestParam int leadId, Model model) throws Exception {
-		List<LeadActivity> leadActivity = leadActivityRepository.selectBYLeadId(leadId);
+        leadDetail.setInternalLongShot(createRefferalRequest.getInternalLongShot());
-		LOGGER.info("leadActivity" + leadActivity);
+        leadDetail.setInternalLeftWall(createRefferalRequest.getInternalLeftWall());
-		model.addAttribute("leadActivity", leadActivity);
+        leadDetail.setInternalRightWall(createRefferalRequest.getInternalRightWall());
-		model.addAttribute("authUserMap",
-				authRepository.selectAllActiveUser().stream().collect(Collectors.toMap(x -> x.getId(), x -> x)));
+        List<LeadBrandModel> brandModels = new ArrayList<LeadBrandModel>();
-		return "lead_activity_modal";
+        for (LeadBrandModel leadBrandModel : createRefferalRequest.getLeadBrands()) {
-	}
-	@RequestMapping(value = "/getLead", method = RequestMethod.GET)
+            LeadBrandModel leadBrand = new LeadBrandModel();
-	public ResponseEntity<?> getLead(HttpServletRequest request, @RequestParam int leadId) throws Exception {
+            leadBrand.setBrand(leadBrandModel.getBrand());
-		Lead lead = leadRepository.selectById(leadId);
+            leadBrand.setValue(leadBrandModel.getValue());
-		LeadDetail leadDetail = leadDetailRepository.selectByLeadId(lead.getId());
-		if (leadDetail != null) {
-			lead.setOutLetName(leadDetail.getOutletName());
+            brandModels.add(leadBrand);
-		}
-		return responseSender.ok(lead);
+        }
-	}
+        leadDetail.setLeadBrands(brandModels);
-	@RequestMapping(value = "/createLead", method = RequestMethod.POST)
+        this.persistLeadDetail(leadDetail, authUser);
-	public String CreateLead(HttpServletRequest request, @RequestBody CreateRefferalRequest createRefferalRequest,
+        model.addAttribute("response1", mvcResponseSender.createResponseString(true));
-			Model model) throws Exception {
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		LOGGER.info("createRefferalRequest" + createRefferalRequest.getSchelduleTimestamp());
-		Lead lead = new Lead();
-		lead.setFirstName(createRefferalRequest.getFirstName());
-		lead.setLastName(createRefferalRequest.getLastName());
-		lead.setLeadMobile(createRefferalRequest.getMobile());
-		lead.setState(createRefferalRequest.getState());
-		lead.setCity(createRefferalRequest.getCity());
-		lead.setAddress(createRefferalRequest.getAddress());
-		lead.setCreatedTimestamp(LocalDateTime.now());
-		lead.setUpdatedTimestamp(LocalDateTime.now());
-		lead.setStatus(createRefferalRequest.getStatus());
-		lead.setAssignTo(createRefferalRequest.getAssignTo());
-		lead.setSource(createRefferalRequest.getSource());
-		lead.setColor("yellow");
+        return "response";
-		// change
-		AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-		String authUserName = authUser.getFirstName() + " " + authUser.getLastName();
-		lead.setCreatedBy(authUserName);
-		lead.setAuthId(authUser.getId());
-		LOGGER.info("lead --- {}", lead);
-		leadRepository.persist(lead);
-		LeadActivity leadActivity = new LeadActivity();
-		leadActivity.setLeadId(lead.getId());
-		leadActivity.setRemark(createRefferalRequest.getRemark());
-		leadActivity.setAuthId(authUser.getId());
-		LOGGER.info("createRefferalRequest" + createRefferalRequest.getCommunicationType());
-		if (createRefferalRequest.getStatus() == LeadStatus.followUp) {
-			leadActivity.setSchelduleTimestamp(createRefferalRequest.getSchelduleTimestamp());
-			leadActivity.setCommunicationType(createRefferalRequest.getCommunicationType());
+    }
-			if (leadActivity.getCommunicationType().equals(CommunicationType.VISIT)) {
+    private void persistLeadDetail(LeadDetailModel leadDetailModel, AuthUser authUser) throws ProfitMandiBusinessException {
-				visitRequestRepository.createVisitRequest(lead.getId(), "lead", lead.getAssignTo(),
+        LeadDetail leadDetail = leadDetailRepository.selectByLeadId(leadDetailModel.getLeadId());
-						createRefferalRequest.getSchelduleTimestamp());
+        if (leadDetail == null) {
-			}
-		} else {
+            leadDetail = new LeadDetail();
-			leadActivity.setSchelduleTimestamp(null);
+            leadDetail.setLeadId(leadDetailModel.getLeadId());
-		}
-		leadActivity.setCreatedTimestamp(LocalDateTime.now());
+            leadDetail.setOutletName(leadDetailModel.getOutletName());
-		leadActivityRepository.persist(leadActivity);
+            leadDetail.setCounterSize(leadDetailModel.getCounterSize());
-		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+            leadDetail.setCreatedBy(authUser.getId());
-		return "response";
+            LOGGER.info("dd {}", leadDetailModel.getFrontp(), leadDetailModel.getFrontWithMarket(), leadDetailModel.getInternalLongShot(), leadDetailModel.getInternalLeftWall(), leadDetailModel.getInternalRightWall());
+            if (leadDetailModel.getFrontp() != 0) {
+                leadDetail.setFrontp(leadDetailModel.getFrontp());
-	}
+            } else {
+                throw new ProfitMandiBusinessException("LeadDetail", "", "Front Image is Required");
-	@RequestMapping(value = "/editLead", method = RequestMethod.POST)
-	public String EditLead(HttpServletRequest request,
+            }
-			@RequestBody CreateLeacdActivityRequest createLeadActivityRequest, Model model) throws Exception {
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+            if (leadDetailModel.getFrontWithMarket() != 0) {
-		AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+                leadDetail.setFrontWithMarket(leadDetailModel.getFrontWithMarket());
+            } else {
+                throw new ProfitMandiBusinessException("LeadDetail", "", "Front With Market Image is Required");
-		LeadDetail leadDetail = leadDetailRepository.selectByLeadId(createLeadActivityRequest.getId());
+            }
-		if (leadDetail == null && !createLeadActivityRequest.getStatus().equals(LeadStatus.notInterested)) {
+            if (leadDetailModel.getInternalLongShot() != 0) {
+                leadDetail.setInternalLongShot(leadDetailModel.getInternalLongShot());
+            } else {
-			throw new ProfitMandiBusinessException("LeadDetail", "", "Please fill lead detail");
+                throw new ProfitMandiBusinessException("LeadDetail", "", "Internal Long Shot  Image is Required");
-		}
-		LeadActivity leadActivity = new LeadActivity();
+            }
-		leadActivity.setLeadId(createLeadActivityRequest.getId());
-		leadActivity.setRemark(createLeadActivityRequest.getRemark());
-		LOGGER.info("createRefferalRequest" + createLeadActivityRequest);
+            if (leadDetailModel.getInternalLeftWall() != 0) {
-		if (createLeadActivityRequest.getStatus() == LeadStatus.followUp) {
-			leadActivity.setSchelduleTimestamp(createLeadActivityRequest.getScheldule());
+                leadDetail.setInternalLeftWall(leadDetailModel.getInternalLeftWall());
-			leadActivity.setCommunicationType(createLeadActivityRequest.getCommunicationType());
-			if (leadActivity.getCommunicationType().equals(CommunicationType.VISIT)) {
-				visitRequestRepository.createVisitRequest(createLeadActivityRequest.getId(), "lead",
-						createLeadActivityRequest.getAssignTo(), createLeadActivityRequest.getScheldule());
-			}
-		} else {
+            } else {
-			leadActivity.setSchelduleTimestamp(null);
-		}
-		leadActivity.setCreatedTimestamp(LocalDateTime.now());
-		leadActivity.setAuthId(authUser.getId());
-		leadActivityRepository.persist(leadActivity);
-		Lead lead = leadRepository.selectById(createLeadActivityRequest.getId());
-		lead.setAssignTo(createLeadActivityRequest.getAssignTo());
-		lead.setStatus(createLeadActivityRequest.getStatus());
-		lead.setNotinterestedReason(createLeadActivityRequest.getReason());
+                throw new ProfitMandiBusinessException("LeadDetail", "", "Internal Left Wall Image is Required");
-		lead.setUpdatedTimestamp(LocalDateTime.now());
+            }
-		lead = leadRepository.selectById(createLeadActivityRequest.getId());
+            if (leadDetailModel.getInternalRightWall() != 0) {
-		int authId = 0;
+                leadDetail.setInternalRightWall(leadDetailModel.getInternalRightWall());
-		if (lead != null) {
+            } else {
+                throw new ProfitMandiBusinessException("LeadDetail", "", "Internal Right Wall Image is Required");
-			authId = lead.getAssignTo();
+            }
-			Map<Integer, LeadActivity> leadActivityMap = new HashMap<>();
-			List<LeadActivity> leadActivitys = leadActivityRepository.selectBYLeadId(lead.getId());
+            leadDetail.setCreatedTimestamp(LocalDateTime.now());
-			if (!leadActivitys.isEmpty()) {
+            leadDetailRepository.persist(leadDetail);
-				leadActivityMap.put(lead.getId(), leadActivitys.get(0));
+            for (LeadBrandModel leadBrandModel : leadDetailModel.getLeadBrands()) {
-			}
-			Map<Integer, AuthUser> authIdAndAuthUserMap = new HashMap<>();
+                LeadBrand leadBrand = new LeadBrand();
+                leadBrand.setBrand(leadBrandModel.getBrand());
+                leadBrand.setValue(leadBrandModel.getValue());
+                leadBrand.setLeadDetailId(leadDetail.getId());
+                leadBrand.setLeadId(leadDetail.getLeadId());
+                leadBrand.setCreatedTimestamp(LocalDateTime.now());
-			AuthUser AuthUser = authRepository.selectById(authId);
+                leadBrandRepository.persist(leadBrand);
+            }
+        } else {
-			authIdAndAuthUserMap.put(AuthUser.getId(), AuthUser);
+            throw new ProfitMandiBusinessException("LeadDetail", "", "Lead Detail Already Created");
+        }
-			model.addAttribute("leadActivityMap", leadActivityMap);
-			model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
-		}
-		model.addAttribute("request", lead);
+    }
-		return "edit-lead";
+    @RequestMapping(value = "/editLead", method = RequestMethod.POST)
+    public String EditLead(HttpServletRequest request, @RequestBody CreateLeacdActivityRequest createLeadActivityRequest, Model model) throws Exception {
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-	}
+        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-	@RequestMapping(value = "/downloadIvoryLead", method = RequestMethod.GET)
-	public ResponseEntity<?> downloadDelayDayTemplate(HttpServletRequest request) throws Exception {
-		List<String> stateNames = stateRepository.selectAll().stream().map(x -> x.getName())
+        LeadDetail leadDetail = leadDetailRepository.selectByLeadId(createLeadActivityRequest.getId());
-				.collect(Collectors.toList());
-		List<List<?>> rows = new ArrayList<>();
+        if (leadDetail == null && !createLeadActivityRequest.getStatus().equals(LeadStatus.notInterested)) {
-		List<LeadSource> lss = LeadSource.enumValues;
+            throw new ProfitMandiBusinessException("LeadDetail", "", "Please fill lead detail");
+        }
-		for (LeadSource ls : lss) {
+        LeadActivity leadActivity = new LeadActivity();
-			rows.add(Arrays.asList("-", "-", "-", "-", "-", "-", "-", ls));
+        leadActivity.setLeadId(createLeadActivityRequest.getId());
+        leadActivity.setRemark(createLeadActivityRequest.getRemark());
-		}
-		for (String stateName : stateNames) {
-			rows.add(Arrays.asList("-", "-", "-", "-", stateName, "-", "-", "-"));
+        LOGGER.info("createRefferalRequest" + createLeadActivityRequest);
+        if (createLeadActivityRequest.getStatus() == LeadStatus.followUp) {
+            leadActivity.setSchelduleTimestamp(createLeadActivityRequest.getScheldule());
+            leadActivity.setCommunicationType(createLeadActivityRequest.getCommunicationType());
+            if (leadActivity.getCommunicationType().equals(CommunicationType.VISIT)) {
+                visitRequestRepository.createVisitRequest(createLeadActivityRequest.getId(), "lead", createLeadActivityRequest.getAssignTo(), createLeadActivityRequest.getScheldule());
+            }
+        } else {
+            leadActivity.setSchelduleTimestamp(null);
-		}
+        }
+        leadActivity.setCreatedTimestamp(LocalDateTime.now());
+        leadActivity.setAuthId(authUser.getId());
+        leadActivityRepository.persist(leadActivity);
+        Lead lead = leadRepository.selectById(createLeadActivityRequest.getId());
+        lead.setAssignTo(createLeadActivityRequest.getAssignTo());
+        lead.setStatus(createLeadActivityRequest.getStatus());
+        lead.setNotinterestedReason(createLeadActivityRequest.getReason());
+        lead.setUpdatedTimestamp(LocalDateTime.now());
-		org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("First Name",
-				"Last Name", "Address", "City", "State", "Mobile", "Assign To(email)", "Source"), rows);
+        lead = leadRepository.selectById(createLeadActivityRequest.getId());
-		final HttpHeaders headers = new HttpHeaders();
+        int authId = 0;
-		headers.set("Content-Type", "text/csv");
+        if (lead != null) {
-		headers.set("Content-disposition", "inline; filename=leads.format.csv");
-		headers.setContentLength(baos.toByteArray().length);
-		final InputStream inputStream = new ByteArrayInputStream(baos.toByteArray());
+            authId = lead.getAssignTo();
-		final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
-		return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
+            Map<Integer, LeadActivity> leadActivityMap = new HashMap<>();
-	}
+            List<LeadActivity> leadActivitys = leadActivityRepository.selectBYLeadId(lead.getId());
-	@RequestMapping(value = "/csvFileAndSetLead", method = RequestMethod.POST)
+            if (!leadActivitys.isEmpty()) {
-	public String readCsvFileAndSetLead(HttpServletRequest request, Model model, HttpServletResponse response,
+                leadActivityMap.put(lead.getId(), leadActivitys.get(0));
-			@RequestPart MultipartFile file) throws Throwable {
+            }
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+            Map<Integer, AuthUser> authIdAndAuthUserMap = new HashMap<>();
-		String email = loginDetails.getEmailId();
+            AuthUser AuthUser = authRepository.selectById(authId);
-		AuthUser createdBy = authRepository.selectByEmailOrMobile(email);
+            authIdAndAuthUserMap.put(AuthUser.getId(), AuthUser);
-		LOGGER.info("file" + file.toString());
+            model.addAttribute("leadActivityMap", leadActivityMap);
+            model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
+        }
-		String fileName = file.getName();
+        model.addAttribute("request", lead);
-		String fileNames = file.getOriginalFilename();
+        return "edit-lead";
-		LOGGER.info("fileName" + fileName);
+    }
-		LOGGER.info("fileNames" + fileNames);
-		List<CSVRecord> records = FileUtil.readFile(file);
+    @RequestMapping(value = "/downloadIvoryLead", method = RequestMethod.GET)
+    public ResponseEntity<?> downloadDelayDayTemplate(HttpServletRequest request) throws Exception {
+        List<String> stateNames = stateRepository.selectAll().stream().map(x -> x.getName()).collect(Collectors.toList());
-		for (CSVRecord record : records) {
+        List<List<?>> rows = new ArrayList<>();
-			Lead lead = new Lead();
-			lead.setFirstName(record.get(0));
-			lead.setLastName(record.get(1));
-			lead.setAddress(record.get(2));
-			lead.setCity(record.get(3));
-			lead.setState(record.get(4));
-			lead.setLeadMobile(record.get(5));
+        List<LeadSource> lss = LeadSource.enumValues;
-			LOGGER.info("record" + record.get(6));
+        for (LeadSource ls : lss) {
-			AuthUser assignTo = authRepository.selectByEmailOrMobile(record.get(6));
+            rows.add(Arrays.asList("-", "-", "-", "-", "-", "-", "-", ls));
+        }
-			if (assignTo == null) {
+        for (String stateName : stateNames) {
-				throw new ProfitMandiBusinessException("Assign To ", record.get(6), "email id not exist");
+            rows.add(Arrays.asList("-", "-", "-", "-", stateName, "-", "-", "-"));
-			}
-			lead.setAssignTo(assignTo.getId());
-			lead.setSource(record.get(7));
+        }
-			lead.setCreatedTimestamp(LocalDateTime.now());
+        org.apache.commons.io.output.ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("First Name", "Last Name", "Address", "City", "State", "Mobile", "Assign To(email)", "Source"), rows);
-			lead.setUpdatedTimestamp(LocalDateTime.now());
+        final HttpHeaders headers = new HttpHeaders();
-			lead.setStatus(LeadStatus.pending);
+        headers.set("Content-Type", "text/csv");
-			lead.setColor("yellow");
-			// change
-			lead.setCreatedBy(createdBy.getFullName());
+        headers.set("Content-disposition", "inline; filename=leads.format.csv");
-			lead.setAuthId(createdBy.getId());
+        headers.setContentLength(baos.toByteArray().length);
+        final InputStream inputStream = new ByteArrayInputStream(baos.toByteArray());
-			leadRepository.persist(lead);
+        final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
+        return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
-			LeadActivity leadActivity = new LeadActivity();
+    }
-			leadActivity.setLeadId(lead.getId());
-			leadActivity.setRemark("New Lead");
-			leadActivity.setSchelduleTimestamp(null);
-			leadActivity.setCreatedTimestamp(LocalDateTime.now());
+    @RequestMapping(value = "/csvFileAndSetLead", method = RequestMethod.POST)
-			leadActivityRepository.persist(leadActivity);
-			model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+    public String readCsvFileAndSetLead(HttpServletRequest request, Model model, HttpServletResponse response, @RequestPart MultipartFile file) throws Throwable {
-		}
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        String email = loginDetails.getEmailId();
-		model.addAttribute("responseSTG", mvcResponseSender.createResponseString(true));
+        AuthUser createdBy = authRepository.selectByEmailOrMobile(email);
-		return "response";
+        LOGGER.info("file" + file.toString());
-	}
+        String fileName = file.getName();
-	@RequestMapping(value = "/teamCommitment", method = RequestMethod.GET)
+        String fileNames = file.getOriginalFilename();
-	public String teamCommitments(HttpServletRequest request, Model model) throws Exception {
-		return "team-commitment";
+        LOGGER.info("fileName" + fileName);
+        LOGGER.info("fileNames" + fileNames);
-	}
+        List<CSVRecord> records = FileUtil.readFile(file);
-	@RequestMapping(value = "/leadDetail", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public String leadDetail(HttpServletRequest request, @RequestBody LeadDetailModel leadDetailModel, Model model)
-			throws Exception {
+        for (CSVRecord record : records) {
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+            Lead lead = new Lead();
-		AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-		LeadDetail leadDetail = leadDetailRepository.selectByLeadId(leadDetailModel.getLeadId());
+            lead.setFirstName(record.get(0));
-		if (leadDetail == null) {
+            lead.setLastName(record.get(1));
-			leadDetail = new LeadDetail();
+            lead.setAddress(record.get(2));
-			leadDetail.setLeadId(leadDetailModel.getLeadId());
+            lead.setCity(record.get(3));
-			leadDetail.setOutletName(leadDetailModel.getOutletName());
+            lead.setState(record.get(4));
-			leadDetail.setCounterSize(leadDetailModel.getCounterSize());
+            lead.setLeadMobile(record.get(5));
-			leadDetail.setCreatedBy(authUser.getId());
+            LOGGER.info("record" + record.get(6));
-			LOGGER.info("dd {}", leadDetailModel.getFrontp(), leadDetailModel.getFrontWithMarket(),
-					leadDetailModel.getInternalLongShot(), leadDetailModel.getInternalLeftWall(),
+            AuthUser assignTo = authRepository.selectByEmailOrMobile(record.get(6));
-					leadDetailModel.getInternalRightWall());
-			if (leadDetailModel.getFrontp() != 0) {
+            if (assignTo == null) {
-				leadDetail.setFrontp(leadDetailModel.getFrontp());
+                throw new ProfitMandiBusinessException("Assign To ", record.get(6), "email id not exist");
-			} else {
+            }
-				throw new ProfitMandiBusinessException("LeadDetail", "", "Front Image is Required");
-			}
+            lead.setAssignTo(assignTo.getId());
+            lead.setSource(record.get(7));
-			if (leadDetailModel.getFrontWithMarket() != 0) {
+            lead.setCreatedTimestamp(LocalDateTime.now());
-				leadDetail.setFrontWithMarket(leadDetailModel.getFrontWithMarket());
-			} else {
-				throw new ProfitMandiBusinessException("LeadDetail", "", "Front With Market Image is Required");
+            lead.setUpdatedTimestamp(LocalDateTime.now());
+            lead.setStatus(LeadStatus.pending);
+            lead.setColor("yellow");
-			}
+            // change
+            lead.setCreatedBy(createdBy.getFullName());
+            lead.setAuthId(createdBy.getId());
-			if (leadDetailModel.getInternalLongShot() != 0) {
+            leadRepository.persist(lead);
-				leadDetail.setInternalLongShot(leadDetailModel.getInternalLongShot());
+            LeadActivity leadActivity = new LeadActivity();
+            leadActivity.setLeadId(lead.getId());
-			} else {
+            leadActivity.setRemark("New Lead");
-				throw new ProfitMandiBusinessException("LeadDetail", "", "Internal Long Shot  Image is Required");
+            leadActivity.setSchelduleTimestamp(null);
-			}
+            leadActivity.setCreatedTimestamp(LocalDateTime.now());
+            leadActivityRepository.persist(leadActivity);
+            model.addAttribute("response1", mvcResponseSender.createResponseString(true));
-			if (leadDetailModel.getInternalLeftWall() != 0) {
+        }
-				leadDetail.setInternalLeftWall(leadDetailModel.getInternalLeftWall());
+        model.addAttribute("responseSTG", mvcResponseSender.createResponseString(true));
-			} else {
-				throw new ProfitMandiBusinessException("LeadDetail", "", "Internal Left Wall Image is Required");
-			}
-			if (leadDetailModel.getInternalRightWall() != 0) {
+        return "response";
-				leadDetail.setInternalRightWall(leadDetailModel.getInternalRightWall());
-			} else {
+    }
-				throw new ProfitMandiBusinessException("LeadDetail", "", "Internal Right Wall Image is Required");
-			}
+    @RequestMapping(value = "/teamCommitment", method = RequestMethod.GET)
+    public String teamCommitments(HttpServletRequest request, Model model) throws Exception {
-			leadDetail.setCreatedTimestamp(LocalDateTime.now());
+        return "team-commitment";
-			leadDetailRepository.persist(leadDetail);
-			for (LeadBrandModel leadBrandModel : leadDetailModel.getLeadBrands()) {
+    }
-				LeadBrand leadBrand = new LeadBrand();
-				leadBrand.setBrand(leadBrandModel.getBrand());
-				leadBrand.setValue(leadBrandModel.getValue());
+    @RequestMapping(value = "/leadDetail", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
-				leadBrand.setLeadDetailId(leadDetail.getId());
+    public String leadDetail(HttpServletRequest request, @RequestBody LeadDetailModel leadDetailModel, Model model) throws Exception {
-				leadBrand.setLeadId(leadDetail.getLeadId());
-				leadBrand.setCreatedTimestamp(LocalDateTime.now());
-				leadBrandRepository.persist(leadBrand);
-			}
-		} else {
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-			throw new ProfitMandiBusinessException("LeadDetail", "", "Lead Detail Already Created");
+        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-		}
+        this.persistLeadDetail(leadDetailModel, authUser);
-		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+        model.addAttribute("response1", mvcResponseSender.createResponseString(true));
-		return "response";
+        return "response";
-	}
+    }
-	@RequestMapping(value = "/getLeadDetail", method = RequestMethod.GET)
+    @RequestMapping(value = "/getLeadDetail", method = RequestMethod.GET)
-	public String getLeadDetail(HttpServletRequest request, Model model) throws Exception {
+    public String getLeadDetail(HttpServletRequest request, Model model) throws Exception {
-		List<Integer> followUpleadIds = leadRepository.selectAllByStatus(LeadStatus.followUp).stream()
+        List<Integer> followUpleadIds = leadRepository.selectAllByStatus(LeadStatus.followUp).stream().map(x -> x.getId()).collect(Collectors.toList());
-				.map(x -> x.getId()).collect(Collectors.toList());
-		List<LeadDetail> leadDetails = leadDetailRepository.selectByLeadIds(followUpleadIds);
+        List<LeadDetail> leadDetails = leadDetailRepository.selectByLeadIds(followUpleadIds);
-		List<DBObject> mobileBrands = mongoClient.getAllBrandsToDisplay(3);
+        List<DBObject> mobileBrands = mongoClient.getAllBrandsToDisplay(3);
-		List<String> brands = mobileBrands.stream().map(x -> (String) x.get("name")).collect(Collectors.toList());
+        List<String> brands = mobileBrands.stream().map(x -> (String) x.get("name")).collect(Collectors.toList());
-		model.addAttribute("brands", brands);
+        model.addAttribute("brands", brands);
-		if (!leadDetails.isEmpty()) {
+        if (!leadDetails.isEmpty()) {
-			List<Integer> detailsIds = leadDetails.stream().map(x -> x.getId()).collect(Collectors.toList());
+            List<Integer> detailsIds = leadDetails.stream().map(x -> x.getId()).collect(Collectors.toList());
-			List<Integer> leadIds = leadDetails.stream().map(x -> x.getLeadId()).collect(Collectors.toList());
+            List<Integer> leadIds = leadDetails.stream().map(x -> x.getLeadId()).collect(Collectors.toList());
-			Map<Integer, Lead> leadMap = leadRepository.selectAllByIds(leadIds).stream()
+            Map<Integer, Lead> leadMap = leadRepository.selectAllByIds(leadIds).stream().filter(x -> x.getStatus().equals(LeadStatus.followUp)).collect(Collectors.toMap(x -> x.getId(), x -> x));
-					.filter(x -> x.getStatus().equals(LeadStatus.followUp))
-					.collect(Collectors.toMap(x -> x.getId(), x -> x));
-			Map<Integer, Optional<LeadActivity>> leadActivityMap = leadActivityRepository.selectAllByleadIds(leadIds)
+            Map<Integer, Optional<LeadActivity>> leadActivityMap = leadActivityRepository.selectAllByleadIds(leadIds).stream().collect(Collectors.groupingBy(x -> x.getLeadId(), Collectors.maxBy(Comparator.comparing(LeadActivity::getId))));
-					.stream().collect(Collectors.groupingBy(x -> x.getLeadId(),
-							Collectors.maxBy(Comparator.comparing(LeadActivity::getId))));
-			model.addAttribute("leadActivityMap", leadActivityMap);
+            model.addAttribute("leadActivityMap", leadActivityMap);
-			List<LeadBrand> leadBrands = leadBrandRepository.selectByLeadDetailId(detailsIds);
+            List<LeadBrand> leadBrands = leadBrandRepository.selectByLeadDetailId(detailsIds);
-			LOGGER.info("leadBrands {}" + leadBrands);
+            LOGGER.info("leadBrands {}" + leadBrands);
-			Map<Integer, Map<String, Integer>> leadDetailBrandValue = new HashMap<>();
+            Map<Integer, Map<String, Integer>> leadDetailBrandValue = new HashMap<>();
-			Map<Integer, List<LeadBrand>> leadDetail = leadBrands.stream()
-					.collect(Collectors.groupingBy(x -> x.getLeadDetailId(), Collectors.toList()));
+            Map<Integer, List<LeadBrand>> leadDetail = leadBrands.stream().collect(Collectors.groupingBy(x -> x.getLeadDetailId(), Collectors.toList()));
-			for (Entry<Integer, List<LeadBrand>> leadDetailEntry : leadDetail.entrySet()) {
+            for (Entry<Integer, List<LeadBrand>> leadDetailEntry : leadDetail.entrySet()) {
-				Map<String, Integer> brandValue = new HashMap<>();
+                Map<String, Integer> brandValue = new HashMap<>();
-				for (LeadBrand leadBrand : leadDetailEntry.getValue()) {
+                for (LeadBrand leadBrand : leadDetailEntry.getValue()) {
-					brandValue.put(leadBrand.getBrand(), leadBrand.getValue());
+                    brandValue.put(leadBrand.getBrand(), leadBrand.getValue());
-				}
+                }
-				leadDetailBrandValue.put(leadDetailEntry.getKey(), brandValue);
+                leadDetailBrandValue.put(leadDetailEntry.getKey(), brandValue);
-			}
+            }
-			LOGGER.info("leadDetailBrandValue {}" + leadDetailBrandValue);
+            LOGGER.info("leadDetailBrandValue {}" + leadDetailBrandValue);
-			model.addAttribute("leadDetailBrandValue", leadDetailBrandValue);
+            model.addAttribute("leadDetailBrandValue", leadDetailBrandValue);
-			model.addAttribute("leadMap", leadMap);
+            model.addAttribute("leadMap", leadMap);
-		}
+        }
-		model.addAttribute("leadDetails", leadDetails);
+        model.addAttribute("leadDetails", leadDetails);
-		Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllActiveUser().stream()
+        Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAllActiveUser().stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
-				.collect(Collectors.toMap(x -> x.getId(), x -> x));
-		model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
+        model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
-		return "lead-detail";
+        return "lead-detail";
-	}
+    }
-	@RequestMapping(value = "/getLeadDetailByLeadId", method = RequestMethod.GET)
+    @RequestMapping(value = "/getLeadDetailByLeadId", method = RequestMethod.GET)
-	public ResponseEntity<?> getLeadDetailByLeadId(HttpServletRequest request, @RequestParam int leadId, Model model)
+    public ResponseEntity<?> getLeadDetailByLeadId(HttpServletRequest request, @RequestParam int leadId, Model model) throws Exception {
-			throws Exception {
-		LeadDetail leadDetail = leadDetailRepository.selectByLeadId(leadId);
+        LeadDetail leadDetail = leadDetailRepository.selectByLeadId(leadId);
-		return responseSender.ok(leadDetail);
+        return responseSender.ok(leadDetail);
-	}
+    }
-	@RequestMapping(value = "/getTeamCommitment", method = RequestMethod.GET)
+    @RequestMapping(value = "/getTeamCommitment", method = RequestMethod.GET)
-	public String getTeamCommitments(HttpServletRequest request, @RequestParam LocalDateTime date, Model model)
+    public String getTeamCommitments(HttpServletRequest request, @RequestParam LocalDateTime date, Model model) throws Exception {
-			throws Exception {
-		List<TeamCommitmentModel> commitments = partnerCollectionPlanRepository
+        List<TeamCommitmentModel> commitments = partnerCollectionPlanRepository.selectTeamCommitmentByDate(date.toLocalDate());
-				.selectTeamCommitmentByDate(date.toLocalDate());
-		model.addAttribute("commitments", commitments);
+        model.addAttribute("commitments", commitments);
-		return "team-commitment-table";
+        return "team-commitment-table";
-	}
+    }
-	@RequestMapping(value = "/partnerHealth", method = RequestMethod.GET)
+    @RequestMapping(value = "/partnerHealth", method = RequestMethod.GET)
-	public String partnerHealth(HttpServletRequest request,
-			@RequestParam(name = "email", required = false) String email, Model model) throws Exception {
+    public String partnerHealth(HttpServletRequest request, @RequestParam(name = "email", required = false) String email, Model model) throws Exception {
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		if (StringUtils.isEmpty(email)) {
+        if (StringUtils.isEmpty(email)) {
-			email = loginDetails.getEmailId();
+            email = loginDetails.getEmailId();
-		} else {
+        } else {
-			AuthUser selectedUser = authRepository.selectByEmailOrMobile(email);
+            AuthUser selectedUser = authRepository.selectByEmailOrMobile(email);
-			model.addAttribute("selectedUser", selectedUser);
+            model.addAttribute("selectedUser", selectedUser);
-		}
+        }
-		AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-		Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
+        Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
-		List<Integer> fofoIds = new ArrayList<>(storeGuyMap.get(email));
+        List<Integer> fofoIds = new ArrayList<>(storeGuyMap.get(email));
-		LocalDateTime startDate = LocalDate.now().atStartOfDay();
+        LocalDateTime startDate = LocalDate.now().atStartOfDay();
-		if (fofoIds != null && fofoIds.size() > 0) {
+        if (fofoIds != null && fofoIds.size() > 0) {
-			List<Integer> fofoIdList = fofoStoreRepository.selectByRetailerIds(fofoIds).stream()
+            List<Integer> fofoIdList = fofoStoreRepository.selectByRetailerIds(fofoIds).stream().filter(x -> !x.isInternal()).map(x -> x.getId()).collect(Collectors.toList());
-					.filter(x -> !x.isInternal()).map(x -> x.getId()).collect(Collectors.toList());
-			Map<Integer, PartnerCollectionPlanModel> foundCollectionMap = partnerCollectionService
+            Map<Integer, PartnerCollectionPlanModel> foundCollectionMap = partnerCollectionService.getCollectionMap(fofoIdList, startDate);
-					.getCollectionMap(fofoIdList, startDate);
-			List<Integer> remarkIds = partnerCollectionRemarkRepository.selectMaxRemarkId(fofoIdList);
+            List<Integer> remarkIds = partnerCollectionRemarkRepository.selectMaxRemarkId(fofoIdList);
-			LOGGER.info("remarkIds {}", remarkIds);
+            LOGGER.info("remarkIds {}", remarkIds);
-			long todayOverallCall = 0;
+            long todayOverallCall = 0;
-			if (!remarkIds.isEmpty()) {
+            if (!remarkIds.isEmpty()) {
-				if (authUser.getEmailId().equals(email)) {
+                if (authUser.getEmailId().equals(email)) {
-					todayOverallCall = partnerCollectionRemarkRepository.selectByIds(remarkIds).stream()
+                    todayOverallCall = partnerCollectionRemarkRepository.selectByIds(remarkIds).stream().filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now())).collect(Collectors.counting());
-							.filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now()))
-							.collect(Collectors.counting());
-				} else {
+                } else {
-					todayOverallCall = partnerCollectionRemarkRepository
-							.selectByAuthIdAndIds(authRepository.selectByEmailOrMobile(email).getId(), remarkIds)
-							.stream().filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now()))
+                    todayOverallCall = partnerCollectionRemarkRepository.selectByAuthIdAndIds(authRepository.selectByEmailOrMobile(email).getId(), remarkIds).stream().filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now())).collect(Collectors.counting());
-							.collect(Collectors.counting());
-				}
+                }
-			}
+            }
-			ChartLeadModel cm = new ChartLeadModel();
+            ChartLeadModel cm = new ChartLeadModel();
-			if (!foundCollectionMap.isEmpty()) {
+            if (!foundCollectionMap.isEmpty()) {
-				cm = this.getCollectionCount(foundCollectionMap.values().stream().collect(Collectors.toList()));
+                cm = this.getCollectionCount(foundCollectionMap.values().stream().collect(Collectors.toList()));
-			}
+            }
-			model.addAttribute("chartPartnerHealth", gson.toJson(cm));
+            model.addAttribute("chartPartnerHealth", gson.toJson(cm));
-			Map<Integer, PartnerDailyInvestment> partnerDailyInvestmentMap = new HashMap<>();
+            Map<Integer, PartnerDailyInvestment> partnerDailyInvestmentMap = new HashMap<>();
-			List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository
+            List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository.selectAll(fofoIdList, startDate.toLocalDate().minusDays(1));
-					.selectAll(fofoIdList, startDate.toLocalDate().minusDays(1));
-			if (!partnerDailyInvestments.isEmpty()) {
+            if (!partnerDailyInvestments.isEmpty()) {
-				partnerDailyInvestmentMap = partnerDailyInvestments.stream()
+                partnerDailyInvestmentMap = partnerDailyInvestments.stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-						.collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-			}
+            }
-			Map<LocalDate, Map<Integer, PartnerCollectionPlanModel>> pcpmMap = new TreeMap<>();
+            Map<LocalDate, Map<Integer, PartnerCollectionPlanModel>> pcpmMap = new TreeMap<>();
-			for (int i = 0; i <= 6; i++) {
+            for (int i = 0; i <= 6; i++) {
-				Map<Integer, PartnerCollectionPlanModel> collectionMap = partnerCollectionService
+                Map<Integer, PartnerCollectionPlanModel> collectionMap = partnerCollectionService.getCollectionMap(fofoIdList, startDate.minusDays(i));
-						.getCollectionMap(fofoIdList, startDate.minusDays(i));
-				pcpmMap.put(startDate.minusDays(i).toLocalDate(), collectionMap);
+                pcpmMap.put(startDate.minusDays(i).toLocalDate(), collectionMap);
-			}
+            }
-			Map<Integer, PartnerCollectionPlanModel> todayPcpmMap = pcpmMap.get(startDate.toLocalDate());
+            Map<Integer, PartnerCollectionPlanModel> todayPcpmMap = pcpmMap.get(startDate.toLocalDate());
-			model.addAttribute("todayPcpmMap", todayPcpmMap);
+            model.addAttribute("todayPcpmMap", todayPcpmMap);
-			TotalTargetColectionModel totalTargetCollection = partnerCollectionService
+            TotalTargetColectionModel totalTargetCollection = partnerCollectionService.getTotalTargetCollection(todayPcpmMap, startDate);
-					.getTotalTargetCollection(todayPcpmMap, startDate);
-			model.addAttribute("totalPartnerTargetCollection", totalTargetCollection.getTotalTarget());
+            model.addAttribute("totalPartnerTargetCollection", totalTargetCollection.getTotalTarget());
-			model.addAttribute("totalPartnerAchievement", totalTargetCollection.getTotalAchievement());
+            model.addAttribute("totalPartnerAchievement", totalTargetCollection.getTotalAchievement());
-			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
+            Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-			Map<Integer, CustomRetailer> customRetailers = fofoIdList.stream().distinct()
-					.map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream()
+            Map<Integer, CustomRetailer> customRetailers = fofoIdList.stream().distinct().map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-					.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-			List<Integer> allReportees = authService.getAllReportees(authUser.getId());
+            List<Integer> allReportees = authService.getAllReportees(authUser.getId());
-			List<Integer> salesPositionsAuthIds = positionRepository
-					.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_SALES).stream()
+            List<Integer> salesPositionsAuthIds = positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_SALES).stream().map(x -> x.getAuthUserId()).collect(Collectors.toList());
-					.map(x -> x.getAuthUserId()).collect(Collectors.toList());
-			List<Integer> rbmPositionsAuthIds = positionRepository
-					.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_RBM).stream()
+            List<Integer> rbmPositionsAuthIds = positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_RBM).stream().map(x -> x.getAuthUserId()).collect(Collectors.toList());
-					.map(x -> x.getAuthUserId()).collect(Collectors.toList());
-			salesPositionsAuthIds.addAll(rbmPositionsAuthIds);
+            salesPositionsAuthIds.addAll(rbmPositionsAuthIds);
-			Set<Integer> empHierarchy = allReportees.stream().filter(x -> salesPositionsAuthIds.contains(x))
+            Set<Integer> empHierarchy = allReportees.stream().filter(x -> salesPositionsAuthIds.contains(x)).collect(Collectors.toSet());
-					.collect(Collectors.toSet());
-			List<AuthUser> authUsers = authRepository.selectAllAuthUserByIds(new ArrayList<>(empHierarchy));
+            List<AuthUser> authUsers = authRepository.selectAllAuthUserByIds(new ArrayList<>(empHierarchy));
-			Map<Integer, AuthUser> authUserMap = authRepository.selectAll().stream()
+            Map<Integer, AuthUser> authUserMap = authRepository.selectAll().stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
-					.collect(Collectors.toMap(x -> x.getId(), x -> x));
-			LOGGER.info("todayPcpmMap {}", todayPcpmMap);
+            LOGGER.info("todayPcpmMap {}", todayPcpmMap);
-			model.addAttribute("authUsers", authUsers);
+            model.addAttribute("authUsers", authUsers);
-			model.addAttribute("authUserMap", authUserMap);
+            model.addAttribute("authUserMap", authUserMap);
-			model.addAttribute("partnerCollectionPlanMap", pcpmMap);
+            model.addAttribute("partnerCollectionPlanMap", pcpmMap);
-			model.addAttribute("partnerDailyInvestmentMap", partnerDailyInvestmentMap);
+            model.addAttribute("partnerDailyInvestmentMap", partnerDailyInvestmentMap);
-			model.addAttribute("customRetailers", customRetailers);
+            model.addAttribute("customRetailers", customRetailers);
-			model.addAttribute("rankColorMap", ProfitMandiConstants.Rank_Color_Map);
+            model.addAttribute("rankColorMap", ProfitMandiConstants.Rank_Color_Map);
-			model.addAttribute("todayOverallCall", todayOverallCall);
+            model.addAttribute("todayOverallCall", todayOverallCall);
-		}
+        }
-		return "partner-health";
+        return "partner-health";
-	}
+    }
-	public ChartLeadModel getCollectionCount(List<PartnerCollectionPlanModel> pcpm)
+    public ChartLeadModel getCollectionCount(List<PartnerCollectionPlanModel> pcpm) throws ProfitMandiBusinessException {
-			throws ProfitMandiBusinessException {
-		Map<Integer, Long> rankCount = pcpm.stream().collect(Collectors.groupingBy(x -> x.getRank(),
+        Map<Integer, Long> rankCount = pcpm.stream().collect(Collectors.groupingBy(x -> x.getRank(), Collectors.mapping(PartnerCollectionPlanModel::getRank, Collectors.counting())));
-				Collectors.mapping(PartnerCollectionPlanModel::getRank, Collectors.counting())));
-		ChartLeadModel cm = new ChartLeadModel();
+        ChartLeadModel cm = new ChartLeadModel();
-		List<String> labels = new ArrayList<>();
+        List<String> labels = new ArrayList<>();
-		labels.add("Plan for Today");
+        labels.add("Plan for Today");
-		labels.add("Carry Forward");
+        labels.add("Carry Forward");
-		labels.add("Untouched");
+        labels.add("Untouched");
-		labels.add("Plan for Future");
+        labels.add("Plan for Future");
-		labels.add("Normal");
+        labels.add("Normal");
-		List<String> backgroundColor = new ArrayList<>();
+        List<String> backgroundColor = new ArrayList<>();
-		List<Long> values = new ArrayList<>();
+        List<Long> values = new ArrayList<>();
-		for (String label : labels) {
+        for (String label : labels) {
-			if (label.equals("Plan for Today")) {
+            if (label.equals("Plan for Today")) {
-				backgroundColor.add("#007bff");
+                backgroundColor.add("#007bff");
-				values.add(rankCount.get(1));
+                values.add(rankCount.get(1));
-			}
+            }
-			if (label.equals("Carry Forward")) {
+            if (label.equals("Carry Forward")) {
-				backgroundColor.add("#ffc107");
+                backgroundColor.add("#ffc107");
-				values.add(rankCount.get(2));
+                values.add(rankCount.get(2));
-			}
+            }
-			if (label.equals("Untouched")) {
+            if (label.equals("Untouched")) {
-				backgroundColor.add("#dc3545");
+                backgroundColor.add("#dc3545");
-				values.add(rankCount.get(3));
+                values.add(rankCount.get(3));
-			}
+            }
-			if (label.equals("Plan for Future")) {
+            if (label.equals("Plan for Future")) {
-				backgroundColor.add("#6c757d");
+                backgroundColor.add("#6c757d");
-				values.add(rankCount.get(4));
+                values.add(rankCount.get(4));
-			}
+            }
-			if (label.equals("Normal")) {
+            if (label.equals("Normal")) {
-				backgroundColor.add("White");
+                backgroundColor.add("White");
-				values.add(rankCount.get(5));
+                values.add(rankCount.get(5));
-			}
+            }
-		}
+        }
-		LOGGER.info("backgroundColor" + backgroundColor);
+        LOGGER.info("backgroundColor" + backgroundColor);
-		LOGGER.info("labelsChartLead" + labels);
+        LOGGER.info("labelsChartLead" + labels);
-		LeadStatusData data = new LeadStatusData();
+        LeadStatusData data = new LeadStatusData();
-		data.setData(values);
+        data.setData(values);
-		data.setBackgroundColor(backgroundColor);
+        data.setBackgroundColor(backgroundColor);
-		data.setLabel("DataSet 1");
+        data.setLabel("DataSet 1");
-		PieLables label = new PieLables();
+        PieLables label = new PieLables();
-		label.setFontColor("black");
+        label.setFontColor("black");
-		label.setFontSize(15);
+        label.setFontSize(15);
-		Legend legend = new Legend();
+        Legend legend = new Legend();
-		legend.setLabels(label);
+        legend.setLabels(label);
-		legend.setPosition("left");
+        legend.setPosition("left");
-		List<LeadStatusData> dataList = new ArrayList<>();
+        List<LeadStatusData> dataList = new ArrayList<>();
-		dataList.add(data);
+        dataList.add(data);
-		DataLeadModel datasets = new DataLeadModel();
+        DataLeadModel datasets = new DataLeadModel();
-		datasets.setDatasets(dataList);
+        datasets.setDatasets(dataList);
-		datasets.setLabels(labels);
+        datasets.setLabels(labels);
-		OptionModel om = new OptionModel();
+        OptionModel om = new OptionModel();
-		om.setLegend(legend);
+        om.setLegend(legend);
-		cm.setType("pie");
+        cm.setType("pie");
-		cm.setData(datasets);
+        cm.setData(datasets);
-		cm.setOptions(om);
+        cm.setOptions(om);
-		return cm;
+        return cm;
-	}
+    }
-	@RequestMapping(value = "/franchiseVisit", method = RequestMethod.GET)
+    @RequestMapping(value = "/franchiseVisit", method = RequestMethod.GET)
-	public String franchiseVisit(HttpServletRequest request,
-			@RequestParam(name = "email", required = false) String email, Model model) throws Exception {
+    public String franchiseVisit(HttpServletRequest request, @RequestParam(name = "email", required = false) String email, Model model) throws Exception {
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
+        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
-		List<Integer> salesPositionsAuthIds = positionRepository
-				.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_SALES).stream()
+        List<Integer> salesPositionsAuthIds = positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_SALES).stream().map(x -> x.getAuthUserId()).collect(Collectors.toList());
-				.map(x -> x.getAuthUserId()).collect(Collectors.toList());
-		List<Integer> rbmPositionsAuthIds = positionRepository
-				.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_RBM).stream()
+        List<Integer> rbmPositionsAuthIds = positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_RBM).stream().map(x -> x.getAuthUserId()).collect(Collectors.toList());
-				.map(x -> x.getAuthUserId()).collect(Collectors.toList());
-		salesPositionsAuthIds.addAll(rbmPositionsAuthIds);
+        salesPositionsAuthIds.addAll(rbmPositionsAuthIds);
-		List<Integer> allReportees = authService.getAllReportees(authUser.getId());
+        List<Integer> allReportees = authService.getAllReportees(authUser.getId());
-		Set<Integer> empHierarchy = allReportees.stream().filter(x -> salesPositionsAuthIds.contains(x))
+        Set<Integer> empHierarchy = allReportees.stream().filter(x -> salesPositionsAuthIds.contains(x)).collect(Collectors.toSet());
-				.collect(Collectors.toSet());
-		List<AuthUser> authUsers = authRepository.selectAllAuthUserByIds(new ArrayList<>(empHierarchy));
+        List<AuthUser> authUsers = authRepository.selectAllAuthUserByIds(new ArrayList<>(empHierarchy));
-		Map<Integer, String> monthValueMap = new HashMap<>();
+        Map<Integer, String> monthValueMap = new HashMap<>();
-		for (int i = 0; i <= 5; i++) {
+        for (int i = 0; i <= 5; i++) {
-			LocalDateTime startOfMonth = LocalDateTime.now().withDayOfMonth(1).minusMonths(i);
+            LocalDateTime startOfMonth = LocalDateTime.now().withDayOfMonth(1).minusMonths(i);
-			monthValueMap.put(i, startOfMonth.format(DateTimeFormatter.ofPattern("MMM''uu")));
+            monthValueMap.put(i, startOfMonth.format(DateTimeFormatter.ofPattern("MMM''uu")));
-		}
+        }
-		model.addAttribute("authUsers", authUsers);
+        model.addAttribute("authUsers", authUsers);
-		model.addAttribute("monthValueMap", monthValueMap);
+        model.addAttribute("monthValueMap", monthValueMap);
-		return "franchise-visit";
+        return "franchise-visit";
-	}
+    }
-	@RequestMapping(value = "/getFranchiseVisit", method = RequestMethod.GET)
+    @RequestMapping(value = "/getFranchiseVisit", method = RequestMethod.GET)
-	public String getFranchiseVisit(HttpServletRequest request,
-			@RequestParam(name = "authId", required = false) int authId, int yearMonth, Model model) throws Exception {
+    public String getFranchiseVisit(HttpServletRequest request, @RequestParam(name = "authId", required = false) int authId, int yearMonth, Model model) throws Exception {
-		LocalDateTime startDate = LocalDate.now().minusMonths(8).withDayOfMonth(1).atStartOfDay();
+        LocalDateTime startDate = LocalDate.now().minusMonths(8).withDayOfMonth(1).atStartOfDay();
-		LocalDateTime endDate = startDate.plusMonths(1).withDayOfMonth(1).toLocalDate().atStartOfDay();
+        LocalDateTime endDate = startDate.plusMonths(1).withDayOfMonth(1).toLocalDate().atStartOfDay();
-		DateRangeModel drm = DateRangeModel.of(startDate, endDate);
+        DateRangeModel drm = DateRangeModel.of(startDate, endDate);
-		List<FranchiseeVisit> visits = franchiseeVisitRepository.selectByAuthUserAndDateRange(drm, authId);
+        List<FranchiseeVisit> visits = franchiseeVisitRepository.selectByAuthUserAndDateRange(drm, authId);
-		if (!visits.isEmpty()) {
+        if (!visits.isEmpty()) {
-			Map<Integer, List<FranchiseeVisit>> franchiseeVisitMap = visits.stream()
-					.collect(Collectors.groupingBy(x -> x.getScheduleTimestamp().getDayOfMonth()));
+            Map<Integer, List<FranchiseeVisit>> franchiseeVisitMap = visits.stream().collect(Collectors.groupingBy(x -> x.getScheduleTimestamp().getDayOfMonth()));
-			model.addAttribute("franchiseeVisitMap", franchiseeVisitMap);
+            model.addAttribute("franchiseeVisitMap", franchiseeVisitMap);
-		}
+        }
-		model.addAttribute("visits", visits);
+        model.addAttribute("visits", visits);
-		model.addAttribute("monthLength", startDate.toLocalDate().lengthOfMonth());
+        model.addAttribute("monthLength", startDate.toLocalDate().lengthOfMonth());
-		// Calender
+        // Calender
-		int Year = startDate.getYear(); // year
+        int Year = startDate.getYear(); // year
-		int startDayOfMonth = 5;
+        int startDayOfMonth = 5;
-		int spaces = startDayOfMonth;
+        int spaces = startDayOfMonth;
-		int month = startDate.getMonthValue();
+        int month = startDate.getMonthValue();
-		int[] days = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+        int[] days = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-		LOGGER.info("visits {} ", visits);
+        LOGGER.info("visits {} ", visits);
-		if ((((Year % 4 == 0) && (Year % 100 != 0)) || (Year % 400 == 0)) && month == 2) {
+        if ((((Year % 4 == 0) && (Year % 100 != 0)) || (Year % 400 == 0)) && month == 2) {
-			days[month] = 29;
+            days[month] = 29;
-		}
+        }
-		spaces = (days[month - 1] + spaces) % 7;
+        spaces = (days[month - 1] + spaces) % 7;
-		model.addAttribute("month", month);
+        model.addAttribute("month", month);
-		model.addAttribute("spaces", spaces);
+        model.addAttribute("spaces", spaces);
-		model.addAttribute("days", days);
+        model.addAttribute("days", days);
-		return "franchise-visit-container";
+        return "franchise-visit-container";
-	}
+    }
-	@RequestMapping(value = "/getFranchiseeActivity", method = RequestMethod.GET)
+    @RequestMapping(value = "/getFranchiseeActivity", method = RequestMethod.GET)
-	public String getFranchiseeActivity(HttpServletRequest request, int visitId, Model model) throws Exception {
+    public String getFranchiseeActivity(HttpServletRequest request, int visitId, Model model) throws Exception {
-		List<FranchiseeActivity> franchiseeActivities = franchiseeActivityRepository.selectByFranchiseeVisitId(visitId);
+        List<FranchiseeActivity> franchiseeActivities = franchiseeActivityRepository.selectByFranchiseeVisitId(visitId);
-		FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(visitId);
+        FranchiseeVisit franchiseeVisit = franchiseeVisitRepository.selectById(visitId);
-		Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAll().stream()
+        Map<Integer, AuthUser> authIdAndAuthUserMap = authRepository.selectAll().stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
-				.collect(Collectors.toMap(x -> x.getId(), x -> x));
-		model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
+        model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
-		model.addAttribute("franchiseeVisit", franchiseeVisit);
+        model.addAttribute("franchiseeVisit", franchiseeVisit);
-		model.addAttribute("franchiseeActivity", franchiseeActivities.get(0));
+        model.addAttribute("franchiseeActivity", franchiseeActivities.get(0));
-		return "franchie-visit-detail";
+        return "franchie-visit-detail";
-	}
+    }
-	@RequestMapping(value = "/indent/today_target", method = RequestMethod.GET)
+    @RequestMapping(value = "/indent/today_target", method = RequestMethod.GET)
-	public String todayTarget(HttpServletRequest request, Model model) throws Exception {
+    public String todayTarget(HttpServletRequest request, Model model) throws Exception {
-		List<RBMPerformanceSummaryModel> summaryModels = new ArrayList<>();
+        List<RBMPerformanceSummaryModel> summaryModels = new ArrayList<>();
-		List<Integer> rbmPositionsAuthIds = positionRepository
-				.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_RBM).stream()
-				.filter(x -> Arrays.asList(EscalationType.L1, EscalationType.L2).contains(x.getEscalationType()))
+        List<Integer> rbmPositionsAuthIds = positionRepository.selectPositionByCategoryId(ProfitMandiConstants.TICKET_CATEGORY_RBM).stream().filter(x -> Arrays.asList(EscalationType.L1, EscalationType.L2).contains(x.getEscalationType())).map(x -> x.getAuthUserId()).distinct().collect(Collectors.toList());
-				.map(x -> x.getAuthUserId()).distinct().collect(Collectors.toList());
-		Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
+        Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
-		List<TeamCommitmentModel> teamCommitmentModels = partnerCollectionPlanRepository
+        List<TeamCommitmentModel> teamCommitmentModels = partnerCollectionPlanRepository.selectTeamCommitmentByDate(LocalDate.now());
-				.selectTeamCommitmentByDate(LocalDate.now());
-		Map<Integer, Double> rbmSecondaryTargetMap = teamCommitmentModels.stream()
-				.filter(x -> rbmPositionsAuthIds.contains(x.getAuthId()))
-				.collect(Collectors.groupingBy(x -> x.getAuthId(),
-						Collectors.summingDouble(x -> x.getTotalTarget() == null ? 0 : x.getTotalTarget())));
+        Map<Integer, Double> rbmSecondaryTargetMap = teamCommitmentModels.stream().filter(x -> rbmPositionsAuthIds.contains(x.getAuthId())).collect(Collectors.groupingBy(x -> x.getAuthId(), Collectors.summingDouble(x -> x.getTotalTarget() == null ? 0 : x.getTotalTarget())));
-		Map<Integer, Double> rbmSecondaryMap = teamCommitmentModels.stream()
-				.filter(x -> rbmPositionsAuthIds.contains(x.getAuthId()))
-				.collect(Collectors.groupingBy(x -> x.getAuthId(),
-						Collectors.summingDouble(x -> x.getTotalAchievement() == null ? 0 : x.getTotalAchievement())));
+        Map<Integer, Double> rbmSecondaryMap = teamCommitmentModels.stream().filter(x -> rbmPositionsAuthIds.contains(x.getAuthId())).collect(Collectors.groupingBy(x -> x.getAuthId(), Collectors.summingDouble(x -> x.getTotalAchievement() == null ? 0 : x.getTotalAchievement())));
-		LocalDateTime startDate = LocalDate.now().atStartOfDay();
+        LocalDateTime startDate = LocalDate.now().atStartOfDay();
-		for (int rbmAuthId : rbmPositionsAuthIds) {
+        for (int rbmAuthId : rbmPositionsAuthIds) {
-			RBMPerformanceSummaryModel rbmPerformanceSummaryModel = new RBMPerformanceSummaryModel();
+            RBMPerformanceSummaryModel rbmPerformanceSummaryModel = new RBMPerformanceSummaryModel();
-			rbmPerformanceSummaryModel.setAuthId(rbmAuthId);
+            rbmPerformanceSummaryModel.setAuthId(rbmAuthId);
-			AuthUser authUser = authRepository.selectById(rbmAuthId);
+            AuthUser authUser = authRepository.selectById(rbmAuthId);
-			rbmPerformanceSummaryModel.setAuthName(authUser.getFullName());
+            rbmPerformanceSummaryModel.setAuthName(authUser.getFullName());
-			List<Integer> fofoIds = new ArrayList<>(storeGuyMap.get(authUser.getEmailId()));
+            List<Integer> fofoIds = new ArrayList<>(storeGuyMap.get(authUser.getEmailId()));
-			if (fofoIds.size() > 0) {
+            if (fofoIds.size() > 0) {
-				fofoIds = fofoStoreRepository.selectByRetailerIds(fofoIds).stream().filter(x -> !x.isInternal())
+                fofoIds = fofoStoreRepository.selectByRetailerIds(fofoIds).stream().filter(x -> !x.isInternal()).map(x -> x.getId()).collect(Collectors.toList());
-						.map(x -> x.getId()).collect(Collectors.toList());
-				/*
+                /*
-				 * Map<Integer, PartnerCollectionPlanModel> foundCollectionMap =
+                 * Map<Integer, PartnerCollectionPlanModel> foundCollectionMap =
-				 * partnerCollectionService .getCollectionMap(fofoIds, startDate);
+                 * partnerCollectionService .getCollectionMap(fofoIds, startDate);
-				 */
+                 */
-				List<Integer> remarkIds = partnerCollectionRemarkRepository.selectMaxRemarkId(fofoIds);
+                List<Integer> remarkIds = partnerCollectionRemarkRepository.selectMaxRemarkId(fofoIds);
-				LOGGER.info("remarkIds {}", remarkIds);
+                LOGGER.info("remarkIds {}", remarkIds);
-				long todayOverallCall = 0;
+                long todayOverallCall = 0;
-				if (!remarkIds.isEmpty()) {
+                if (!remarkIds.isEmpty()) {
-					todayOverallCall = partnerCollectionRemarkRepository.selectByIds(remarkIds).stream()
+                    todayOverallCall = partnerCollectionRemarkRepository.selectByIds(remarkIds).stream().filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now())).collect(Collectors.counting());
-							.filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now()))
-							.collect(Collectors.counting());
-				}
+                }
-				Map<Integer, PartnerCollectionPlanModel> collectionMap = partnerCollectionService
+                Map<Integer, PartnerCollectionPlanModel> collectionMap = partnerCollectionService.getCollectionMap(fofoIds, startDate);
-						.getCollectionMap(fofoIds, startDate);
-				ChartLeadModel cm = this
-						.getCollectionCount(collectionMap.values().stream().collect(Collectors.toList()));
+                ChartLeadModel cm = this.getCollectionCount(collectionMap.values().stream().collect(Collectors.toList()));
-				long collectionTarget = collectionMap.values().stream().filter(x -> x.getTargetPlan() != null)
+                long collectionTarget = collectionMap.values().stream().filter(x -> x.getTargetPlan() != null).collect(Collectors.summingLong(x -> x.getTargetPlan()));
-						.collect(Collectors.summingLong(x -> x.getTargetPlan()));
-				long collection = collectionMap.values().stream().filter(
+                long collection = collectionMap.values().stream().filter(
-						x -> x.getTargetPlan() != null && x.getTargetPlan() != 0 && x.getAchievementPlan() != null)
+                        x -> x.getTargetPlan() != null && x.getTargetPlan() != 0 && x.getAchievementPlan() != null).collect(Collectors.summingLong(x -> x.getAchievementPlan()));
-						.collect(Collectors.summingLong(x -> x.getAchievementPlan()));
-				rbmPerformanceSummaryModel.setChartLeadModel(cm);
+                rbmPerformanceSummaryModel.setChartLeadModel(cm);
-				rbmPerformanceSummaryModel.setPartnersCommunicated(todayOverallCall);
+                rbmPerformanceSummaryModel.setPartnersCommunicated(todayOverallCall);
-				rbmPerformanceSummaryModel.setCollectionTarget(collectionTarget);
+                rbmPerformanceSummaryModel.setCollectionTarget(collectionTarget);
-				rbmPerformanceSummaryModel.setCollection(collection);
+                rbmPerformanceSummaryModel.setCollection(collection);
-				rbmPerformanceSummaryModel.setSecondaryTarget(rbmSecondaryTargetMap.get(rbmAuthId) == null ? 0
+                rbmPerformanceSummaryModel.setSecondaryTarget(rbmSecondaryTargetMap.get(rbmAuthId) == null ? 0 : rbmSecondaryTargetMap.get(rbmAuthId).floatValue());
-						: rbmSecondaryTargetMap.get(rbmAuthId).floatValue());
-				rbmPerformanceSummaryModel.setSecondary(
+                rbmPerformanceSummaryModel.setSecondary(
-						rbmSecondaryMap.get(rbmAuthId) == null ? 0 : rbmSecondaryMap.get(rbmAuthId).floatValue());
+                        rbmSecondaryMap.get(rbmAuthId) == null ? 0 : rbmSecondaryMap.get(rbmAuthId).floatValue());
-				summaryModels.add(rbmPerformanceSummaryModel);
+                summaryModels.add(rbmPerformanceSummaryModel);
-				// cm.getData().getDatasets().get(0).getData().;
+                // cm.getData().getDatasets().get(0).getData().;
-				// cm.getData().getDatasets().get(0).getBackgroundColor();
+                // cm.getData().getDatasets().get(0).getBackgroundColor();
-				// cm.getData().getLabels()
+                // cm.getData().getLabels()
-			}
+            }
-		}
+        }
-		model.addAttribute("summaryModels", summaryModels);
+        model.addAttribute("summaryModels", summaryModels);
-		return "today_target";
+        return "today_target";
-	}
+    }
-	@RequestMapping(value = "/visitPlan", method = RequestMethod.GET)
+    @RequestMapping(value = "/visitPlan", method = RequestMethod.GET)
-	public String visitPlan(HttpServletRequest request, Model model) throws Exception {
+    public String visitPlan(HttpServletRequest request, Model model) throws Exception {
-		return "visit-request-plan";
+        return "visit-request-plan";
-	}
+    }
-	@RequestMapping(value = "/visit/getVisitPlan", method = RequestMethod.GET)
+    @RequestMapping(value = "/visit/getVisitPlan", method = RequestMethod.GET)
-	public String getVisitPlan(HttpServletRequest request, @RequestParam LocalDate date, Model model) throws Exception {
+    public String getVisitPlan(HttpServletRequest request, @RequestParam LocalDate date, Model model) throws Exception {
-		List<VisitRequest> visitRequests = visitRequestRepository.selectByAuthIdAndDate(date);
+        List<VisitRequest> visitRequests = visitRequestRepository.selectByAuthIdAndDate(date);
-		List<Integer> leadIds = visitRequests.stream().filter(x -> x.getVisitType().equals("lead"))
+        List<Integer> leadIds = visitRequests.stream().filter(x -> x.getVisitType().equals("lead")).map(x -> x.getVisitId()).collect(Collectors.toList());
-				.map(x -> x.getVisitId()).collect(Collectors.toList());
-		Map<Integer, Lead> leadMap = new HashMap<>();
+        Map<Integer, Lead> leadMap = new HashMap<>();
-		if (!leadIds.isEmpty()) {
+        if (!leadIds.isEmpty()) {
-			List<Lead> leads = leadRepository.selectAllByIds(leadIds);
+            List<Lead> leads = leadRepository.selectAllByIds(leadIds);
-			for (Lead lead : leads) {
+            for (Lead lead : leads) {
-				List<LeadActivity> leadActivities = leadActivityRepository.selectBYLeadId(lead.getId());
+                List<LeadActivity> leadActivities = leadActivityRepository.selectBYLeadId(lead.getId());
-				lead.setScheduledTimestamp(leadActivities.get(0).getSchelduleTimestamp());
+                lead.setScheduledTimestamp(leadActivities.get(0).getSchelduleTimestamp());
-				lead.setLeadActivity(leadActivities.get(0));
+                lead.setLeadActivity(leadActivities.get(0));
-				leadMap.put(lead.getId(), lead);
+                leadMap.put(lead.getId(), lead);
-			}
+            }
-		}
+        }
-		List<Integer> franchiseeIds = visitRequests.stream().filter(x -> x.getVisitType().equals("franchiseeVisit"))
+        List<Integer> franchiseeIds = visitRequests.stream().filter(x -> x.getVisitType().equals("franchiseeVisit")).map(x -> x.getVisitId()).collect(Collectors.toList());
-				.map(x -> x.getVisitId()).collect(Collectors.toList());
-		Map<Integer, FranchiseeVisit> franchiseeVisitsMap = new HashMap<>();
+        Map<Integer, FranchiseeVisit> franchiseeVisitsMap = new HashMap<>();
-		if (!franchiseeIds.isEmpty()) {
+        if (!franchiseeIds.isEmpty()) {
-			List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository.selectAllByIds(franchiseeIds);
+            List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository.selectAllByIds(franchiseeIds);
-			LOGGER.info("franchiseeVisits {}", franchiseeVisits);
+            LOGGER.info("franchiseeVisits {}", franchiseeVisits);
-			for (FranchiseeVisit franchiseeVisit : franchiseeVisits) {
+            for (FranchiseeVisit franchiseeVisit : franchiseeVisits) {
-				List<FranchiseeActivity> franchiseeActivities = franchiseeActivityRepository
+                List<FranchiseeActivity> franchiseeActivities = franchiseeActivityRepository.selectByFranchiseeVisitId(franchiseeVisit.getId());
-						.selectByFranchiseeVisitId(franchiseeVisit.getId());
-				LOGGER.info("franchiseeActivities {}", franchiseeActivities);
+                LOGGER.info("franchiseeActivities {}", franchiseeActivities);
-				franchiseeVisit.setScheduleTimestamp(franchiseeActivities.get(0).getSchelduleTimestamp());
+                franchiseeVisit.setScheduleTimestamp(franchiseeActivities.get(0).getSchelduleTimestamp());
-				franchiseeVisit.setFranchiseeActivity(franchiseeActivities.get(0));
+                franchiseeVisit.setFranchiseeActivity(franchiseeActivities.get(0));
-				franchiseeVisitsMap.put(franchiseeVisit.getId(), franchiseeVisit);
+                franchiseeVisitsMap.put(franchiseeVisit.getId(), franchiseeVisit);
-			}
+            }
-		}
+        }
-		Map<Integer, List<VisitRequest>> visitRequestMap = visitRequests.stream()
+        Map<Integer, List<VisitRequest>> visitRequestMap = visitRequests.stream().collect(Collectors.groupingBy(x -> x.getCreatedBy()));
-				.collect(Collectors.groupingBy(x -> x.getCreatedBy()));
-		List<AuthUser> authUsers = authRepository.selectAllActiveUser();
+        List<AuthUser> authUsers = authRepository.selectAllActiveUser();
-		List<UserVisitModel> userVisits = new ArrayList<>();
+        List<UserVisitModel> userVisits = new ArrayList<>();
-		for (AuthUser authUser : authUsers) {
+        for (AuthUser authUser : authUsers) {
-			List<VisitRequest> authVisitRequests = visitRequestMap.get(authUser.getId());
+            List<VisitRequest> authVisitRequests = visitRequestMap.get(authUser.getId());
-			if (authVisitRequests != null) {
+            if (authVisitRequests != null) {
-				UserVisitModel userVisitModel = new UserVisitModel();
+                UserVisitModel userVisitModel = new UserVisitModel();
-				userVisitModel.setAuthUser(authUser.getFullName());
+                userVisitModel.setAuthUser(authUser.getFullName());
-				List<VisitDescriptionModel> visitDescriptions = new ArrayList<>();
+                List<VisitDescriptionModel> visitDescriptions = new ArrayList<>();
-				for (VisitRequest authVisitRequest : authVisitRequests) {
+                for (VisitRequest authVisitRequest : authVisitRequests) {
-					VisitDescriptionModel visitDescriptionModel = new VisitDescriptionModel();
+                    VisitDescriptionModel visitDescriptionModel = new VisitDescriptionModel();
-					visitDescriptionModel.setVisitId(authVisitRequest.getVisitId());
+                    visitDescriptionModel.setVisitId(authVisitRequest.getVisitId());
-					if (authVisitRequest.getVisitType().equals("lead")) {
+                    if (authVisitRequest.getVisitType().equals("lead")) {
-						Lead lead = leadMap.get(authVisitRequest.getVisitId());
+                        Lead lead = leadMap.get(authVisitRequest.getVisitId());
-						visitDescriptionModel.setVisitName(lead.getFirstName());
+                        visitDescriptionModel.setVisitName(lead.getFirstName());
-						visitDescriptionModel.setCity(lead.getCity());
+                        visitDescriptionModel.setCity(lead.getCity());
-						visitDescriptionModel.setState(lead.getState());
+                        visitDescriptionModel.setState(lead.getState());
-						visitDescriptionModel.setScheduleTime(lead.getScheduledTimestamp());
+                        visitDescriptionModel.setScheduleTime(lead.getScheduledTimestamp());
-						visitDescriptionModel.setRemarks(lead.getLeadActivity().getRemark());
+                        visitDescriptionModel.setRemarks(lead.getLeadActivity().getRemark());
-					} else {
+                    } else {
-						FranchiseeVisit franchiseeVisit = franchiseeVisitsMap.get(authVisitRequest.getVisitId());
+                        FranchiseeVisit franchiseeVisit = franchiseeVisitsMap.get(authVisitRequest.getVisitId());
-						CustomRetailer customRetailer = retailerService.getFofoRetailer(franchiseeVisit.getFofoId());
+                        CustomRetailer customRetailer = retailerService.getFofoRetailer(franchiseeVisit.getFofoId());
-						visitDescriptionModel.setVisitName(franchiseeVisit.getPartnerName());
+                        visitDescriptionModel.setVisitName(franchiseeVisit.getPartnerName());
-						visitDescriptionModel.setCity(customRetailer.getAddress().getCity());
+                        visitDescriptionModel.setCity(customRetailer.getAddress().getCity());
-						visitDescriptionModel.setState(customRetailer.getAddress().getState());
+                        visitDescriptionModel.setState(customRetailer.getAddress().getState());
-						visitDescriptionModel
-								.setScheduleTime(franchiseeVisit.getFranchiseeActivity().getSchelduleTimestamp());
+                        visitDescriptionModel.setScheduleTime(franchiseeVisit.getFranchiseeActivity().getSchelduleTimestamp());
-						visitDescriptionModel.setRemarks(franchiseeVisit.getAgenda());
+                        visitDescriptionModel.setRemarks(franchiseeVisit.getAgenda());
-					}
+                    }
-					if (authVisitRequest.getActionedBy() != 0) {
+                    if (authVisitRequest.getActionedBy() != 0) {
-						AuthUser au = authRepository.selectById(authVisitRequest.getActionedBy());
+                        AuthUser au = authRepository.selectById(authVisitRequest.getActionedBy());
-						visitDescriptionModel.setActionBy(au.getFullName());
+                        visitDescriptionModel.setActionBy(au.getFullName());
-					}
+                    }
-					visitDescriptionModel.setStatus(authVisitRequest.getStatus());
+                    visitDescriptionModel.setStatus(authVisitRequest.getStatus());
-					visitDescriptionModel.setVisitType(authVisitRequest.getVisitType());
+                    visitDescriptionModel.setVisitType(authVisitRequest.getVisitType());
-					visitDescriptions.add(visitDescriptionModel);
+                    visitDescriptions.add(visitDescriptionModel);
-				}
+                }
-				userVisitModel.setVisitDescriptions(visitDescriptions);
+                userVisitModel.setVisitDescriptions(visitDescriptions);
-				userVisits.add(userVisitModel);
+                userVisits.add(userVisitModel);
-			}
+            }
-		}
+        }
-		model.addAttribute("userVisits", userVisits);
+        model.addAttribute("userVisits", userVisits);
-		return "visit-request-plan";
+        return "visit-request-plan";
-	}
+    }
+}

Subversion Repositories SmartDukaan

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