Subversion Repositories SmartDukaan

Rev

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

Rev 34119 Rev 34127
Line 311... Line 311...
311
        LOGGER.info("ChartLeadModel" + gson.toJson(cm));
311
        LOGGER.info("ChartLeadModel" + gson.toJson(cm));
312
        LOGGER.info("lwDays" + lwDays);
312
        LOGGER.info("lwDays" + lwDays);
313
 
313
 
314
        LOGGER.info("leads" + leads);
314
        LOGGER.info("leads" + leads);
315
        List<String> stateNames = stateRepository.selectAll().stream().map(x -> x.getName()).collect(Collectors.toList());
315
        List<String> stateNames = stateRepository.selectAll().stream().map(x -> x.getName()).collect(Collectors.toList());
316
        List<AuthUser> authUsers = authRepository.selectAllActiveUser();
316
//        List<AuthUser> authUsers = authRepository.selectAllActiveUser();
-
 
317
        List<AuthUser> authUsers = csService.getAuthUserIds(ProfitMandiConstants.TICKET_CATEGORY_SALES, Arrays.asList(EscalationType.L1, EscalationType.L2, EscalationType.L3));
317
        LocalDate lastDate = curDate.minusDays(1).toLocalDate();
318
        LocalDate lastDate = curDate.minusDays(1).toLocalDate();
318
 
319
 
319
        List<LocalDate> weekDates = new ArrayList<>();
320
        List<LocalDate> weekDates = new ArrayList<>();
320
 
321
 
321
        weekDates.add(curDate.minusDays(28).toLocalDate());
322
        weekDates.add(curDate.minusDays(28).toLocalDate());
Line 660... Line 661...
660
        } else {
661
        } else {
661
            leadActivity.setSchelduleTimestamp(null);
662
            leadActivity.setSchelduleTimestamp(null);
662
        }
663
        }
663
        leadActivity.setCreatedTimestamp(LocalDateTime.now());
664
        leadActivity.setCreatedTimestamp(LocalDateTime.now());
664
        leadActivityRepository.persist(leadActivity);
665
        leadActivityRepository.persist(leadActivity);
-
 
666
        if (!lead.getStatus().equals(LeadStatus.notInterested)) {
-
 
667
            LeadDetailModel leadDetail = new LeadDetailModel();
-
 
668
            leadDetail.setLeadId(lead.getId());
-
 
669
            leadDetail.setOutletName(createRefferalRequest.getOutletName());
-
 
670
            leadDetail.setCounterSize(createRefferalRequest.getCounterSize());
665
 
671
 
666
        LeadDetailModel leadDetail = new LeadDetailModel();
-
 
667
        leadDetail.setLeadId(lead.getId());
-
 
668
        leadDetail.setOutletName(createRefferalRequest.getOutletName());
-
 
669
        leadDetail.setCounterSize(createRefferalRequest.getCounterSize());
-
 
670
 
672
 
-
 
673
            leadDetail.setFrontp(createRefferalRequest.getFrontp());
-
 
674
            leadDetail.setFrontWithMarket(createRefferalRequest.getFrontWithMarket());
671
 
675
 
672
        leadDetail.setFrontp(createRefferalRequest.getFrontp());
-
 
673
        leadDetail.setFrontWithMarket(createRefferalRequest.getFrontWithMarket());
-
 
674
 
676
 
-
 
677
            leadDetail.setInternalLongShot(createRefferalRequest.getInternalLongShot());
675
 
678
 
676
        leadDetail.setInternalLongShot(createRefferalRequest.getInternalLongShot());
679
            leadDetail.setInternalLeftWall(createRefferalRequest.getInternalLeftWall());
677
 
680
 
678
        leadDetail.setInternalLeftWall(createRefferalRequest.getInternalLeftWall());
681
            leadDetail.setInternalRightWall(createRefferalRequest.getInternalRightWall());
-
 
682
            List<LeadBrandModel> brandModels = new ArrayList<LeadBrandModel>();
679
 
683
 
680
        leadDetail.setInternalRightWall(createRefferalRequest.getInternalRightWall());
-
 
681
        List<LeadBrandModel> brandModels = new ArrayList<LeadBrandModel>();
684
            for (LeadBrandModel leadBrandModel : createRefferalRequest.getLeadBrands()) {
682
 
685
 
683
        for (LeadBrandModel leadBrandModel : createRefferalRequest.getLeadBrands()) {
686
                LeadBrandModel leadBrand = new LeadBrandModel();
-
 
687
                leadBrand.setBrand(leadBrandModel.getBrand());
-
 
688
                leadBrand.setValue(leadBrandModel.getValue());
684
 
689
 
685
            LeadBrandModel leadBrand = new LeadBrandModel();
690
                brandModels.add(leadBrand);
686
            leadBrand.setBrand(leadBrandModel.getBrand());
-
 
687
            leadBrand.setValue(leadBrandModel.getValue());
-
 
688
 
691
 
689
            brandModels.add(leadBrand);
692
            }
690
 
693
 
691
        }
694
            leadDetail.setLeadBrands(brandModels);
692
 
695
 
693
        leadDetail.setLeadBrands(brandModels);
-
 
694
        if (!lead.getStatus().equals(LeadStatus.notInterested)) {
-
 
695
            leadRepository.persistLeadDetail(leadDetail, authUser);
696
            leadRepository.persistLeadDetail(leadDetail, authUser);
696
        }
697
        }
697
        model.addAttribute("response1", mvcResponseSender.createResponseString(true));
698
        model.addAttribute("response1", mvcResponseSender.createResponseString(true));
698
 
699
 
699
        return "response";
700
        return "response";
Line 742... Line 743...
742
            lead.setColor("Yellow");
743
            lead.setColor("Yellow");
743
        }
744
        }
744
        lead.setNotinterestedReason(createLeadActivityRequest.getReason());
745
        lead.setNotinterestedReason(createLeadActivityRequest.getReason());
745
        lead.setUpdatedTimestamp(LocalDateTime.now());
746
        lead.setUpdatedTimestamp(LocalDateTime.now());
746
 
747
 
747
        lead = leadRepository.selectById(createLeadActivityRequest.getId());
-
 
748
 
-
 
749
        int authId = 0;
748
        int authId = 0;
750
        if (lead != null) {
749
        authId = lead.getAssignTo();
-
 
750
        Map<Integer, LeadActivity> leadActivityMap = new HashMap<>();
751
 
751
 
752
            authId = lead.getAssignTo();
-
 
753
            Map<Integer, LeadActivity> leadActivityMap = new HashMap<>();
752
        List<LeadActivity> leadActivitys = leadActivityRepository.selectBYLeadId(lead.getId());
754
 
753
 
-
 
754
        if (!leadActivitys.isEmpty()) {
755
            List<LeadActivity> leadActivitys = leadActivityRepository.selectBYLeadId(lead.getId());
755
            leadActivityMap.put(lead.getId(), leadActivitys.get(0));
-
 
756
        }
756
 
757
 
757
            if (!leadActivitys.isEmpty()) {
758
        Map<Integer, AuthUser> authIdAndAuthUserMap = new HashMap<>();
758
                leadActivityMap.put(lead.getId(), leadActivitys.get(0));
759
        AuthUser AuthUser = authRepository.selectById(authId);
759
            }
-
 
760
 
760
 
761
            Map<Integer, AuthUser> authIdAndAuthUserMap = new HashMap<>();
-
 
762
            AuthUser AuthUser = authRepository.selectById(authId);
761
        authIdAndAuthUserMap.put(AuthUser.getId(), AuthUser);
763
 
762
 
-
 
763
        model.addAttribute("leadActivityMap", leadActivityMap);
764
            authIdAndAuthUserMap.put(AuthUser.getId(), AuthUser);
764
        model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
765
 
765
 
766
            model.addAttribute("leadActivityMap", leadActivityMap);
-
 
767
            model.addAttribute("authIdAndAuthUserMap", authIdAndAuthUserMap);
-
 
768
        }
-
 
769
 
766
 
770
        model.addAttribute("lead", lead);
767
        model.addAttribute("lead", lead);
771
 
768
 
772
        return "edit-lead";
769
        return "edit-lead";
773
 
770
 
Line 1096... Line 1093...
1096
 
1093
 
1097
        return "rbm-today-arr";
1094
        return "rbm-today-arr";
1098
    }
1095
    }
1099
 
1096
 
1100
 
1097
 
1101
 
-
 
1102
    @RequestMapping(value = "/partnerHealth", method = RequestMethod.GET)
1098
    @RequestMapping(value = "/partnerHealth", method = RequestMethod.GET)
1103
    public String partnerHealth(HttpServletRequest request, @RequestParam(name = "email", required = false) String email, Model model) throws Exception {
1099
    public String partnerHealth(HttpServletRequest request, @RequestParam(name = "email", required = false) String email, Model model) throws Exception {
1104
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
1100
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
1105
 
1101
 
1106
        if (StringUtils.isEmpty(email)) {
1102
        if (StringUtils.isEmpty(email)) {