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

 package com.spice.profitmandi.web.controller;
-import java.io.IOException;
-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;
-import javax.servlet.http.HttpServletRequest;
-import com.spice.profitmandi.common.enumuration.ActivationType;
-import com.spice.profitmandi.common.util.Utils;
-import com.spice.profitmandi.common.web.client.RestClient;
-import com.spice.profitmandi.dao.entity.cs.*;
-import com.spice.profitmandi.dao.entity.dtr.Document;
-import com.spice.profitmandi.dao.entity.fofo.*;
-import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
-import com.spice.profitmandi.dao.model.*;
-import com.spice.profitmandi.dao.repository.cs.*;
-import com.spice.profitmandi.dao.repository.dtr.*;
-import com.spice.profitmandi.dao.repository.user.AddressRepository;
-import org.apache.commons.csv.CSVRecord;
-import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 import com.mongodb.DBObject;
+import com.spice.profitmandi.common.enumuration.ActivationType;
 import com.spice.profitmandi.common.enumuration.MessageType;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.CustomRetailer;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.model.SendNotificationModel;
 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
 import com.spice.profitmandi.dao.entity.auth.PartnerCollectionPlan;
 import com.spice.profitmandi.dao.entity.auth.PartnerCollectionRemark;
 import com.spice.profitmandi.dao.entity.auth.PartnerSecondaryPlan;
+import com.spice.profitmandi.dao.entity.cs.Position;
 import com.spice.profitmandi.dao.entity.dtr.User;
 import com.spice.profitmandi.dao.entity.dtr.UserAccount;
-import com.spice.profitmandi.dao.entity.user.FranchiseeActivity;
+import com.spice.profitmandi.dao.entity.fofo.FofoStore;
-import com.spice.profitmandi.dao.entity.user.FranchiseeVisit;
+import com.spice.profitmandi.dao.entity.fofo.PartnerDailyInvestment;
-import com.spice.profitmandi.dao.entity.user.Lead;
-import com.spice.profitmandi.dao.entity.user.LeadActivity;
+import com.spice.profitmandi.dao.entity.fofo.PartnerOnBoardingPanel;
-import com.spice.profitmandi.dao.entity.user.VisitRequest;
+import com.spice.profitmandi.dao.entity.user.*;
 import com.spice.profitmandi.dao.enumuration.auth.CollectionRemark;
-import com.spice.profitmandi.dao.enumuration.dtr.CommunicationType;
+import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
-import com.spice.profitmandi.dao.enumuration.dtr.FranchiseeActivityStatus;
-import com.spice.profitmandi.dao.enumuration.dtr.FranchiseeVisitStatus;
-import com.spice.profitmandi.dao.enumuration.dtr.LeadStatus;
+import com.spice.profitmandi.dao.enumuration.dtr.*;
-import com.spice.profitmandi.dao.enumuration.dtr.StoreTimeline;
+import com.spice.profitmandi.dao.model.*;
-import com.spice.profitmandi.dao.enumuration.dtr.VisitStatus;
+import com.spice.profitmandi.dao.repository.auth.*;
-import com.spice.profitmandi.dao.repository.auth.AuthRepository;
+import com.spice.profitmandi.dao.repository.cs.*;
-import com.spice.profitmandi.dao.repository.auth.AuthUserPartnerMappingRepository;
-import com.spice.profitmandi.dao.repository.auth.PartnerCollectionPlanRepository;
-import com.spice.profitmandi.dao.repository.auth.PartnerCollectionRemarkRepository;
-import com.spice.profitmandi.dao.repository.auth.PartnerSecondaryPlanRepository;
+import com.spice.profitmandi.dao.repository.dtr.*;
 import com.spice.profitmandi.dao.repository.fofo.PartnerDailyInvestmentRepository;
 import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
+import com.spice.profitmandi.dao.repository.user.AddressRepository;
 import com.spice.profitmandi.service.AuthService;
 import com.spice.profitmandi.service.NotificationService;
 import com.spice.profitmandi.service.PartnerCollectionService;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.service.user.StoreTimelineTatService;
 import com.spice.profitmandi.web.req.CreateFranchiseeRequest;
 import com.spice.profitmandi.web.res.Partner;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
+import org.apache.commons.csv.CSVRecord;
+import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+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(rollbackFor = Throwable.class)
 public class LeadController {
     private static final Logger LOGGER = LogManager.getLogger(LeadController.class);
     @Autowired
     private LeadRepository leadRepository;
     @Autowired
-    private ActivityRepository activityRepository;
-    @Autowired
-    private TicketActivityMediaRepository activityMeidaRepository;
-    @Autowired
     DocumentRepository documentRepository;
     @Autowired
     PositionRepository positionRepository;
                             .filter(x -> x.getCreateTimestamp().toLocalDate().equals(LocalDate.now()))
                             .collect(Collectors.counting());
+                }
-                Map<Integer, PartnerCollectionPlanModel> CollectionMap = partnerCollectionService
+                Map<Integer, PartnerCollectionPlanModel> collectionMap = partnerCollectionService
                         .getCollectionMap(fofoIdList, startDate);
-                Map<Integer, List<PartnerSecondaryPlanModel>> partnerSecondayPlans = orderRepository
+                Map<Integer, List<PartnerSecondaryPlanModel>> partnerSecondaryPlans = orderRepository
                         .selectPartnerSecondaryGroupByBrand(fofoIdList, startDate.toLocalDate()).stream()
                         .collect(Collectors.groupingBy(x -> x.getFofoId()));
-                LOGGER.info("partnerSecondayPlans {}", partnerSecondayPlans);
+                LOGGER.info("partnerSecondayPlans {}", partnerSecondaryPlans);
                 for (Entry<Integer, CustomRetailer> customRetailerEntry : customRetailers.entrySet()) {
                     int fofoId = customRetailerEntry.getKey();
                     CustomRetailer customRetailer = customRetailerEntry.getValue();
                     float totalSecondaryPlan = 0;
                     float totalSecondaryAchivement = 0;
                     if (partnerDailyInvestmentMap.get(fofoId) != null) {
                         ptam.setWalletAmount(partnerDailyInvestmentMap.get(fofoId).getWalletAmount());
                         ptam.setShortInvestment(partnerDailyInvestmentMap.get(fofoId).getShortInvestment());
+                    }
-                    if (CollectionMap.get(fofoId) != null) {
+                    if (collectionMap.get(fofoId) != null) {
-                        PartnerCollectionPlanModel collectionPlan = CollectionMap.get(fofoId);
+                        PartnerCollectionPlanModel collectionPlan = collectionMap.get(fofoId);
                         ptam.setRemark(collectionPlan.getRemark());
                         ptam.setMessage(collectionPlan.getMessage());
                         ptam.setRemarkTimestamp(collectionPlan.getRemarkTimestamp());
                         ptam.setRank(collectionPlan.getRank());
                     // Secondary
                     PartnerSecondaryPlanModel otherPartnerSecondaryPlanModel = null;
                     Map<String, PartnerSecondaryPlanModel> secondaryModelMap = new HashMap<>();
-                    if (partnerSecondayPlans.get(fofoId) != null) {
+                    if (partnerSecondaryPlans.get(fofoId) != null) {
                         long otherBrandSecondary = 0;
-                        for (PartnerSecondaryPlanModel pspm : partnerSecondayPlans.get(fofoId)) {
+                        for (PartnerSecondaryPlanModel pspm : partnerSecondaryPlans.get(fofoId)) {
                             Integer authId = pspm.getAuthId();
                             if (!brands.contains(pspm.getBrand())) {
                                 if (pspm.getAchievementPlan() != null) {
                                     otherBrandSecondary += pspm.getAchievementPlan();
+                                }
+                            }
+                        }
                         if (otherPartnerSecondaryPlanModel != null) {
                             otherPartnerSecondaryPlanModel.setAchievementPlan(otherBrandSecondary);
+                        }
-                        secondaryModelMap = partnerSecondayPlans.get(fofoId).stream()
+                        secondaryModelMap = partnerSecondaryPlans.get(fofoId).stream()
                                 .filter(x -> brands.contains(x.getBrand()))
                                 .collect(Collectors.toMap(x -> x.getBrand(), x -> x));
                         if (secondaryModelMap.containsKey("Others")) {
                             PartnerSecondaryPlanModel psp = secondaryModelMap.get("Others");
                 tm.setTodayCollectionCount((int) todayCollectionCount);
                 List<PartnerTargetAchievementModel> filteredPtams;
                 if (isRBMAndL1) {
                     filteredPtams = ptams.stream()
-                            .filter(ptam -> !(CollectionRemark.RBM_ESCALATION.equals(ptam.getRemark()) || CollectionRemark.SALES_ESCALATION.equals(ptam.getRemark())))
+                            .filter(ptam -> !(CollectionRemark.RBM_L2_ESCALATION.equals(ptam.getRemark()) || CollectionRemark.SALES_ESCALATION.equals(ptam.getRemark())))
                             .collect(Collectors.toList());
                 } else if (isRBMAndNotL1) {
                     filteredPtams = ptams.stream()
                             .filter(ptam -> !(CollectionRemark.SALES_ESCALATION.equals(ptam.getRemark())))
                             .collect(Collectors.toList());

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java – Rev 32940 → 32978