Subversion Repositories SmartDukaan

Rev

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

Rev 35818 Rev 35821
Line 873... Line 873...
873
            todayTargetPartners.addAll(planTodayPartners);
873
            todayTargetPartners.addAll(planTodayPartners);
874
            todayTargetPartners.addAll(carryForwardPartners);
874
            todayTargetPartners.addAll(carryForwardPartners);
875
            todayTargetPartners.addAll(zeroBillingPartners);
875
            todayTargetPartners.addAll(zeroBillingPartners);
876
            todayTargetPartners.addAll(untouchedPartners);
876
            todayTargetPartners.addAll(untouchedPartners);
877
 
877
 
878
            // Value Achieved = All distinct partners contacted today (all remarks made today by this RBM)
878
            // Value Achieved = All distinct partners contacted today (only remarks with call log)
879
            List<PartnerCollectionRemark> todayRemarks = remarksByAuthId.getOrDefault(rbmAuthId, Collections.emptyList());
879
            List<PartnerCollectionRemark> todayRemarks = remarksByAuthId.getOrDefault(rbmAuthId, Collections.emptyList());
880
            long valueAchieved = todayRemarks.stream()
880
            long valueAchieved = todayRemarks.stream()
-
 
881
                    .filter(r -> r.getAgentCallLogId() > 0)  // Only count remarks with call log
881
                    .map(PartnerCollectionRemark::getFofoId)
882
                    .map(PartnerCollectionRemark::getFofoId)
882
                    .distinct()
883
                    .distinct()
883
                    .count();
884
                    .count();
884
            targetModel.setValueTargetAchieved(valueAchieved);
885
            targetModel.setValueTargetAchieved(valueAchieved);
885
 
886
 
Line 921... Line 922...
921
            l2Model.setPartnerCount(l2AssignedFofoIds.size());
922
            l2Model.setPartnerCount(l2AssignedFofoIds.size());
922
 
923
 
923
            // L2 Target = partners with RBM_L2_ESCALATION as latest remark
924
            // L2 Target = partners with RBM_L2_ESCALATION as latest remark
924
            l2Model.setTodayTargetOfCall(l2TargetFofoIds.size());
925
            l2Model.setTodayTargetOfCall(l2TargetFofoIds.size());
925
 
926
 
926
            // Value Achieved = All distinct partners contacted today (all remarks made today by this L2)
927
            // Value Achieved = All distinct partners contacted today (only remarks with call log)
927
            List<PartnerCollectionRemark> l2TodayRemarks = remarksByAuthId.getOrDefault(l2AuthId, Collections.emptyList());
928
            List<PartnerCollectionRemark> l2TodayRemarks = remarksByAuthId.getOrDefault(l2AuthId, Collections.emptyList());
928
            long l2ValueAchieved = l2TodayRemarks.stream()
929
            long l2ValueAchieved = l2TodayRemarks.stream()
-
 
930
                    .filter(r -> r.getAgentCallLogId() > 0)  // Only count remarks with call log
929
                    .map(PartnerCollectionRemark::getFofoId)
931
                    .map(PartnerCollectionRemark::getFofoId)
930
                    .distinct()
932
                    .distinct()
931
                    .count();
933
                    .count();
932
            l2Model.setValueTargetAchieved(l2ValueAchieved);
934
            l2Model.setValueTargetAchieved(l2ValueAchieved);
933
 
935