Subversion Repositories SmartDukaan

Rev

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

Rev 34915 Rev 34916
Line 626... Line 626...
626
            }
626
            }
627
            String abmName ="";
627
            String abmName ="";
628
            int abmId = csService.getAuthUserId(ProfitMandiConstants.TICKET_CATEGORY_ABM,EscalationType.L1,fofoId);
628
            int abmId = csService.getAuthUserId(ProfitMandiConstants.TICKET_CATEGORY_ABM,EscalationType.L1,fofoId);
629
            if(abmId !=0){
629
            if(abmId !=0){
630
                abmName = authRepository.selectById(abmId).getFullName();
630
                abmName = authRepository.selectById(abmId).getFullName();
-
 
631
            }else{
-
 
632
                int abmL2Id = csService.getAuthUserId(ProfitMandiConstants.TICKET_CATEGORY_ABM,EscalationType.L2,fofoId);
-
 
633
                abmName = authRepository.selectById(abmL2Id).getFullName();
631
            }
634
            }
632
            AST ast = astRepository.selectById(customRetailers.get(fofoId).getAstId());
635
            AST ast = astRepository.selectById(customRetailers.get(fofoId).getAstId());
633
 
636
 
634
            PartnerType partnerTypeThisMonth = partnerTypeChangeService.getTypeOnMonth(fofoId, currentMonth);
637
            PartnerType partnerTypeThisMonth = partnerTypeChangeService.getTypeOnMonth(fofoId, currentMonth);
635
 
638
 
Line 996... Line 999...
996
        //generate excel and sent to mail
999
        //generate excel and sent to mail
997
        List<List<String>> headerGroup = new ArrayList<>();
1000
        List<List<String>> headerGroup = new ArrayList<>();
998
 
1001
 
999
        List<String> headers1 = Arrays.asList(
1002
        List<String> headers1 = Arrays.asList(
1000
                "","","","",
1003
                "","","","",
1001
                "Retailer Detail", "","", "", "", "", "", "", "", "","","","",
1004
                "Retailer Detail", "","", "", "", "", "", "", "", "","","","","",
1002
 
1005
 
1003
                twoMonthAgoStringValue, "", "", "", "", "", "",
1006
                twoMonthAgoStringValue, "", "", "", "", "", "",
1004
                lastMonthStringValue, "", "", "", "", "", "",
1007
                lastMonthStringValue, "", "", "", "", "", "",
1005
                currentMonthStringValue, "", "", "", "", "", "",
1008
                currentMonthStringValue, "", "", "", "", "", "",
1006
 
1009
 
Line 1011... Line 1014...
1011
 
1014
 
1012
        );
1015
        );
1013
 
1016
 
1014
        List<String> headers2 = Arrays.asList(
1017
        List<String> headers2 = Arrays.asList(
1015
                "Assessment","Zero billing","Billing needed","Counta",
1018
                "Assessment","Zero billing","Billing needed","Counta",
1016
                "BM","Partner Id","Link","Wallet Date","Creation Date","Code","Area",  "City", "Store Name", "Status","Category","Sales Manager", "RBM",
1019
                "BM","Partner Id","Link","Wallet Date","Creation Date","Code","Area",  "City", "Store Name", "Status","Category","Sales Manager", "RBM","ABM",
1017
                "Secondary Target", "Secondary Achieved", "Returns", "Net Secondary", "Secondary %",
1020
                "Secondary Target", "Secondary Achieved", "Returns", "Net Secondary", "Secondary %",
1018
                "Tertiary Sale", "Unbilled",
1021
                "Tertiary Sale", "Unbilled",
1019
                "Secondary Target", "Secondary Achieved", "Returns", "Net Secondary", "Secondary %",
1022
                "Secondary Target", "Secondary Achieved", "Returns", "Net Secondary", "Secondary %",
1020
                "Tertiary Sale", "Unbilled",
1023
                "Tertiary Sale", "Unbilled",
1021
                "Secondary Target", "Secondary Achieved", "Returns", "Net Secondary", "Secondary %",
1024
                "Secondary Target", "Secondary Achieved", "Returns", "Net Secondary", "Secondary %",