1.活动量分值详情显示错误

2.战队销售业绩预测(预计)显示错误

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

@@ -2725,6 +2725,12 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             BigDecimal defaultCommission = BigDecimal.ZERO;
             BigDecimal defaultCommission = BigDecimal.ZERO;
             BigDecimal defaultPremium = BigDecimal.ZERO;
             BigDecimal defaultPremium = BigDecimal.ZERO;
             Integer defaultPieces = 0;
             Integer defaultPieces = 0;
+            if (!mktLeadsGoalsList.isEmpty()) {
+                MktLeadsGoals leadsGoals = mktLeadsGoalsList.get(0);
+                defaultCommission = new BigDecimal(leadsGoals.getCommission());
+                defaultPremium = new BigDecimal(leadsGoals.getPremium());
+                defaultPieces = leadsGoals.getPieces();
+            }
             for (MktLeadsAssigneds leadsAssigneds : mktLeadsAssignedsList) {
             for (MktLeadsAssigneds leadsAssigneds : mktLeadsAssignedsList) {
                 String timeToClose = CommonUtil.dateParseString(leadsAssigneds.getTimeToClose(), "yyyy-MM-dd");
                 String timeToClose = CommonUtil.dateParseString(leadsAssigneds.getTimeToClose(), "yyyy-MM-dd");
                 if (CommonUtil.isNullOrBlank(timeToClose)) {
                 if (CommonUtil.isNullOrBlank(timeToClose)) {

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

@@ -448,15 +448,18 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
                     recruitScore += schedule.getTrackScore();
                     recruitScore += schedule.getTrackScore();
                     continue;
                     continue;
                 }
                 }
-                if (223 == schedule.getMdDropOptionId()) {
+//                223 -- 226
+//                224 -- 227 
+//                226 -- 229
+                if (226 == schedule.getMdDropOptionId().intValue()) {
                     coachScore += this.calculateScheduleDisplayCount(schedule, startDate, endDate) * schedule.getTrackScore();
                     coachScore += this.calculateScheduleDisplayCount(schedule, startDate, endDate) * schedule.getTrackScore();
                     continue;
                     continue;
                 }
                 }
-                if (224 == schedule.getMdDropOptionId()) {
+                if (227 == schedule.getMdDropOptionId().intValue()) {
                     trainScore += this.calculateScheduleDisplayCount(schedule, startDate, endDate) * schedule.getTrackScore();
                     trainScore += this.calculateScheduleDisplayCount(schedule, startDate, endDate) * schedule.getTrackScore();
                     continue;
                     continue;
                 }
                 }
-                if (226 == schedule.getMdDropOptionId()) {
+                if (229 == schedule.getMdDropOptionId().intValue()) {
                     meetingScore += this.calculateScheduleDisplayCount(schedule, startDate, endDate) * schedule.getTrackScore();
                     meetingScore += this.calculateScheduleDisplayCount(schedule, startDate, endDate) * schedule.getTrackScore();
                     continue;
                     continue;
                 }
                 }