WebSVN – SmartDukaan – Diff – /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java

         for(Integer fofoId: retailerIds){
             String rbmName = "";
             int rbmL1 = csService.getAuthUserId(ProfitMandiConstants.TICKET_CATEGORY_RBM,EscalationType.L1,fofoId);
             if(rbmL1 != 0){
                  rbmName = authRepository.selectById(rbmL1).getFullName();
+            }else {
+                int rbmL2 = csService.getAuthUserId(ProfitMandiConstants.TICKET_CATEGORY_RBM, EscalationType.L2, fofoId);
+                if(rbmL2 != 0){
+                    rbmName = authRepository.selectById(rbmL2).getFullName();
+                }
+            }
             String bmName ="";
             int bmId = csService.getAuthUserId(ProfitMandiConstants.TICKET_CATEGORY_SALES,EscalationType.L2,fofoId);
             if(bmId !=0){
                 bmName = authRepository.selectById(bmId).getFullName();
             //            generate investment info
             FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(fofoId);
             float shortInvestment = partnerDailyInvestmentMap.get(fofoId) != null ? partnerDailyInvestmentMap.get(fofoId).getShortInvestment() : 0f;
             float agreedInvestment = partnerDailyInvestmentMap.get(fofoId) != null ? partnerDailyInvestmentMap.get(fofoId).getMinInvestment() : 0f;
-            float investmentLevel = partnerDailyInvestmentMap.get(fofoId) != null ? ((shortInvestment-agreedInvestment)/agreedInvestment)*100 : 0f;
+            float investmentLevel = partnerDailyInvestmentMap.get(fofoId) != null
+                    ? Math.abs(((shortInvestment - agreedInvestment) / agreedInvestment) * 100)
+                    : 0f;
             List<Loan> fofoDefaultLoans = new ArrayList<>();
             if(defaultLoanMap != null){
                  fofoDefaultLoans  =  defaultLoanMap.get(fofoId);
                 LOGGER.info("fofoDefaultLoans {}",fofoDefaultLoans);
             float activeLoan = loanRepository.selectActiveLoan(fofoId).stream().map(Loan::getPendingAmount).reduce(BigDecimal.ZERO,BigDecimal::add).floatValue();
             float poValue = partnerDailyInvestmentMap.get(fofoId) != null ?  partnerDailyInvestmentMap.get(fofoId).getUnbilledAmount() : 0f;
-            List<Order> billedAndPoOrder = orderRepository.selectOrders(Arrays.asList(fofoId),Arrays.asList(OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.ACCEPTED, OrderStatus.BILLED, OrderStatus.SHIPPED_FROM_WH, OrderStatus.DELIVERY_SUCCESS),startOfToday,startOfToday.plusDays(1));
+            List<Order> billedAndPoOrder = orderRepository.selectOrders(Arrays.asList(fofoId),Arrays.asList(OrderStatus.SUBMITTED_FOR_PROCESSING, OrderStatus.ACCEPTED, OrderStatus.BILLED, OrderStatus.SHIPPED_FROM_WH, OrderStatus.DELIVERY_SUCCESS),currentMonthStartDate,startOfToday.plusDays(1));
             float poAndBilledValue = (float) billedAndPoOrder.stream().map(Order::getTotalAmount).reduce(0f,Float::sum);
             double purchaseMtd = secondaryMtd.getOrDefault(fofoId, 0.0);
             double todayRequiredDrr = rbmTargetService.calculateFofoIdTodayTarget(fofoId, purchaseMtd,LocalDate.now());
         //generate excel and sent to mail
         List<List<String>> headerGroup = new ArrayList<>();
         List<String> headers1 = Arrays.asList(
                 "","","","",
-                "Retailer Detail", "", "", "", "", "", "", "", "",
+                "Retailer Detail", "","", "", "", "", "", "", "", "",
-                currentMonthStringValue, "", "", "", "", "", "",
-                lastMonthStringValue, "", "", "", "", "", "",
                 twoMonthAgoStringValue, "", "", "", "", "", "",
+                lastMonthStringValue, "", "", "", "", "", "",
+                currentMonthStringValue, "", "", "", "", "", "",
                 "","", "", "", "", "", "", "", "", "", "", "", "", "",
                 "", "", "", "", "", "", "", "", "", "", "", "", "",
                 "", "", "", "", "", "", "", "", "", "", "", "", ""
         );
         List<String> headers2 = Arrays.asList(
                 "Assessment","Zero billing","Billing needed","Counta",
-                "Code", "Store Name", "City", "Area", "BM", "Sales Manager", "RBM", "Status", "Category",
+                "BM","Partner Id","Code","Area",  "City", "Store Name", "Status","Category","Sales Manager", "RBM",
                 "Secondary Target", "Secondary Achieved", "Returns", "Net Secondary", "Secondary %",
                 "Tertiary Sale", "Unbilled",
                 "Secondary Target", "Secondary Achieved", "Returns", "Net Secondary", "Secondary %",
                 "Tertiary Sale", "Unbilled",
                 "Secondary Target", "Secondary Achieved", "Returns", "Net Secondary", "Secondary %",
             BiSecondaryModel twoAgo = monthlyData.getOrDefault(YearMonth.now().minusMonths(2), new BiSecondaryModel(0,0,0,0,0,0,0));
             List<Object> row = new ArrayList<>();
             row.addAll(Arrays.asList(
                     assessmentMap.get(fofoId),zeroBillingMap.get(fofoId),billingNeededMap.get(fofoId),countAMap.get(fofoId),
-                    retailer.getCode(), retailer.getStoreName(), retailer.getCity(), retailer.getArea(),
+                    retailer.getBmName(),fofoId , retailer.getCode(), retailer.getArea(), retailer.getCity(),  retailer.getStoreName(), retailer.getStatus(),
-                    retailer.getBmName(), retailer.getSalesManager(), retailer.getRbm(),
+                    retailer.getCategory(),  retailer.getSalesManager(), retailer.getRbm()
-                    retailer.getStatus(), retailer.getCategory()
             ));
-            // Current Month
+            // Two Months Ago
             row.addAll(Arrays.asList(
-                    current.getSecondaryTarget(),
+                    twoAgo.getSecondaryTarget(),
-                    current.getSecondaryAchieved(),
+                    twoAgo.getSecondaryAchieved(),
-                    current.getSecondaryReturn(),
+                    twoAgo.getSecondaryReturn(),
-                    current.getNetSecondary(),
+                    twoAgo.getNetSecondary(),
-                    current.getSecondaryAchievedPercent(),
+                    twoAgo.getSecondaryAchievedPercent(),
-                    current.getTertiary(),
+                    twoAgo.getTertiary(),
-                    current.getTertiaryUnBilled()
+                    twoAgo.getTertiaryUnBilled()
             ));
             // Last Month
             row.addAll(Arrays.asList(
                     last.getSecondaryTarget(),
                     last.getSecondaryAchievedPercent(),
                     last.getTertiary(),
                     last.getTertiaryUnBilled()
             ));
-            // Two Months Ago
+            // Current Month
             row.addAll(Arrays.asList(
-                    twoAgo.getSecondaryTarget(),
+                    current.getSecondaryTarget(),
-                    twoAgo.getSecondaryAchieved(),
+                    current.getSecondaryAchieved(),
-                    twoAgo.getSecondaryReturn(),
+                    current.getSecondaryReturn(),
-                    twoAgo.getNetSecondary(),
+                    current.getNetSecondary(),
-                    twoAgo.getSecondaryAchievedPercent(),
+                    current.getSecondaryAchievedPercent(),
-                    twoAgo.getTertiary(),
+                    current.getTertiary(),
-                    twoAgo.getTertiaryUnBilled()
+                    current.getTertiaryUnBilled()
             ));
             FofoInvestmentModel fofoInvestmentModelValue = biInvestmentModelMap.get(fofoId);
             if(fofoInvestmentModelValue != null){
                 row.addAll(Arrays.asList(
                         fofoInvestmentModelValue.getCounterPotential(),
                         fofoInvestmentModelValue.getShortInvestment(),

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java – Rev 34676 → 34677