修改-销售业绩预测列表查询

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -2056,13 +2056,6 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             List<MktLeadsGoals> mktLeadsGoalsList = (List<MktLeadsGoals>)CollectionUtils.select(mktLeadsGoals,predicate);
             List<MktLeadsGoals> mktLeadsGoalsList = (List<MktLeadsGoals>)CollectionUtils.select(mktLeadsGoals,predicate);
             predicate = new BeanPropertyValueEqualsPredicate("seqTime", month);
             predicate = new BeanPropertyValueEqualsPredicate("seqTime", month);
             mktLeadsGoalsList = (List<MktLeadsGoals>)CollectionUtils.select(mktLeadsGoalsList,predicate);
             mktLeadsGoalsList = (List<MktLeadsGoals>)CollectionUtils.select(mktLeadsGoalsList,predicate);
-            if (mktLeadsGoalsList.isEmpty()){
-                info.setPractitionerId(praId);
-                info.setName(practitionerIdToName.get(praId));
-                infos.add(info);
-                continue;
-            }
-            MktLeadsGoals leadsGoals = mktLeadsGoalsList.get(0);
             //筛选此经纪人的所有指派信息
             //筛选此经纪人的所有指派信息
             predicate = new BeanPropertyValueEqualsPredicate("assignedPractitionerId", praId);
             predicate = new BeanPropertyValueEqualsPredicate("assignedPractitionerId", praId);
             List<MktLeadsAssigneds> mktLeadsAssignedsList = (List<MktLeadsAssigneds>)CollectionUtils.select(mktLeadsAssigneds,predicate);
             List<MktLeadsAssigneds> mktLeadsAssignedsList = (List<MktLeadsAssigneds>)CollectionUtils.select(mktLeadsAssigneds,predicate);
@@ -2081,13 +2074,16 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
                     defaultPremium = defaultPremium.add(leadsAssigneds.getFyp());
                     defaultPremium = defaultPremium.add(leadsAssigneds.getFyp());
                 }
                 }
             }
             }
-            Double achievementRate = defaultCommission.divide(BigDecimal.valueOf(leadsGoals.getCommission()),4,BigDecimal.ROUND_HALF_UP).doubleValue();
             info.setPractitionerId(praId);
             info.setPractitionerId(praId);
             info.setName(practitionerIdToName.get(praId));
             info.setName(practitionerIdToName.get(praId));
             info.setPieces(defaultPieces);
             info.setPieces(defaultPieces);
             info.setPremium(defaultPremium.doubleValue());
             info.setPremium(defaultPremium.doubleValue());
             info.setCommission(defaultCommission.doubleValue());
             info.setCommission(defaultCommission.doubleValue());
-            info.setAchievementRate(achievementRate);
+            if (!mktLeadsGoalsList.isEmpty()){
+                MktLeadsGoals leadsGoals = mktLeadsGoalsList.get(0);
+                Double achievementRate = defaultCommission.divide(BigDecimal.valueOf(leadsGoals.getCommission()),4,BigDecimal.ROUND_HALF_UP).doubleValue();
+                info.setAchievementRate(achievementRate);
+            }
             infos.add(info);
             infos.add(info);
         }
         }
         return infos;
         return infos;