Subversion Repositories SmartDukaan

Rev

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

Rev 34912 Rev 34915
Line 622... Line 622...
622 
            if(managerId != 0){
 622 
            if(managerId != 0){
623 
                 managerName = authRepository.selectById(managerId).getFullName();
 623 
                 managerName = authRepository.selectById(managerId).getFullName();
624 
            }else {
 624 
            }else {
625 
                managerName = bmName;
 625 
                managerName = bmName;
626 
            }
 626 
            }
- 
 
 627 
            String abmName ="";
- 
 
 628 
            int abmId = csService.getAuthUserId(ProfitMandiConstants.TICKET_CATEGORY_ABM,EscalationType.L1,fofoId);
- 
 
 629 
            if(abmId !=0){
- 
 
 630 
                abmName = authRepository.selectById(abmId).getFullName();
627 
 
 631 
            }
628 
            AST ast = astRepository.selectById(customRetailers.get(fofoId).getAstId());
 632 
            AST ast = astRepository.selectById(customRetailers.get(fofoId).getAstId());
629 
 
 633 
 
630 
            PartnerType partnerTypeThisMonth = partnerTypeChangeService.getTypeOnMonth(fofoId, currentMonth);
 634 
            PartnerType partnerTypeThisMonth = partnerTypeChangeService.getTypeOnMonth(fofoId, currentMonth);
631 
 
 635 
 
632 
//            generate retaile detail
 636 
//            generate retaile detail
Line 650... Line 654...
650 
            biRetailerModel.setStoreName(customRetailers.get(fofoId).getBusinessName());
 654 
            biRetailerModel.setStoreName(customRetailers.get(fofoId).getBusinessName());
651 
            biRetailerModel.setStatus(retailerStatus);
 655 
            biRetailerModel.setStatus(retailerStatus);
652 
            biRetailerModel.setCategory(String.valueOf(partnerTypeThisMonth));
 656 
            biRetailerModel.setCategory(String.valueOf(partnerTypeThisMonth));
653 
            biRetailerModel.setSalesManager(managerName);
 657 
            biRetailerModel.setSalesManager(managerName);
654 
            biRetailerModel.setRbm(rbmName);
 658 
            biRetailerModel.setRbm(rbmName);
- 
 
 659 
            biRetailerModel.setAbm(abmName);
655 
 
 660 
 
656 
            biRetailerModelMap.put(fofoId,biRetailerModel);
 661 
            biRetailerModelMap.put(fofoId,biRetailerModel);
657 
 
 662 
 
658 
 
 663 
 
659 
//            generate secondary data
 664 
//            generate secondary data
Line 1063... Line 1068...
1063 
                    retailer.getCity(),
 1068 
                    retailer.getCity(),
1064 
                    retailer.getStoreName(),
 1069 
                    retailer.getStoreName(),
1065 
                    retailer.getStatus(),
 1070 
                    retailer.getStatus(),
1066 
                    retailer.getCategory(),
 1071 
                    retailer.getCategory(),
1067 
                    retailer.getSalesManager(),
 1072 
                    retailer.getSalesManager(),
1068 
                    retailer.getRbm()
 1073 
                    retailer.getRbm(),
- 
 
 1074 
                    retailer.getAbm()
1069 
 
 1075 
 
1070 
            ));
 1076 
            ));
1071 
 
 1077 
 
1072 
 
 1078 
 
1073 
            // Two Months Ago
 1079 
            // Two Months Ago