Subversion Repositories SmartDukaan

Rev

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

Rev 34394 Rev 34428
Line 1086... Line 1086...
1086 
                tm.setTotalPartnerCollection(totalPartnerAchievementCollection);
 1086 
                tm.setTotalPartnerCollection(totalPartnerAchievementCollection);
1087 
                tm.setTodayCollectionCount((int) todayCollectionCount);
 1087 
                tm.setTodayCollectionCount((int) todayCollectionCount);
1088 
                List<PartnerTargetAchievementModel> filteredPtams;
 1088 
                List<PartnerTargetAchievementModel> filteredPtams;
1089 
 
 1089 
 
1090 
                if (isRBMAndL1) {
 1090 
                if (isRBMAndL1) {
- 
 
 1091 
                    filteredPtams = ptams;
- 
 
 1092 
//                    as of now all party is showing to rbm
1091 
                    filteredPtams = ptams.stream()
 1093 
                    /*filteredPtams = ptams.stream()
1092 
                            .filter(ptam -> !(CollectionRemark.RBM_L2_ESCALATION.equals(ptam.getRemark()) || CollectionRemark.SALES_ESCALATION.equals(ptam.getRemark())))
 1094 
                            .filter(ptam -> !(CollectionRemark.RBM_L2_ESCALATION.equals(ptam.getRemark()) || CollectionRemark.SALES_ESCALATION.equals(ptam.getRemark())))
1093 
                            .collect(Collectors.toList());
 1095 
                            .collect(Collectors.toList());*/
1094 
                } else if (isRBMAndNotL1) {
 1096 
                } else if (isRBMAndNotL1) {
1095 
                    filteredPtams = ptams.stream()
 1097 
                    filteredPtams = ptams.stream()
1096 
                            .filter(ptam -> !(CollectionRemark.SALES_ESCALATION.equals(ptam.getRemark())))
 1098 
                            .filter(ptam -> !(CollectionRemark.SALES_ESCALATION.equals(ptam.getRemark())))
1097 
                            .collect(Collectors.toList());
 1099 
                            .collect(Collectors.toList());
1098 
                } else if (isSales) {
 1100 
                } else if (isSales) {
Line 1100... Line 1102...
1100 
                            .filter(ptam -> !(CollectionRemark.RBM_L2_ESCALATION.equals(ptam.getRemark())))
 1102 
                            .filter(ptam -> !(CollectionRemark.RBM_L2_ESCALATION.equals(ptam.getRemark())))
1101 
                            .collect(Collectors.toList());
 1103 
                            .collect(Collectors.toList());
1102 
                } else {
 1104 
                } else {
1103 
                    filteredPtams = ptams;
 1105 
                    filteredPtams = ptams;
1104 
                }
 1106 
                }
1105 
 
 - 
 
- 
 
 1107 
                tm.setRBMAndL1(isRBMAndL1);
- 
 
 1108 
                tm.setRBMAndNotL1(isRBMAndNotL1);
- 
 
 1109 
                tm.setSales(isSales);
1106 
                tm.setTargetAchievement(filteredPtams.stream().sorted(Comparator.comparing(PartnerTargetAchievementModel::getRank))
 1110 
                tm.setTargetAchievement(filteredPtams.stream().sorted(Comparator.comparing(PartnerTargetAchievementModel::getRank))
1107 
                        .collect(Collectors.toList()));
 1111 
                        .collect(Collectors.toList()));
1108 
 
 1112 
 
1109 
            }
 1113 
            }
1110 
 
 1114