修改-统计累计增加商机人数

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

@@ -1612,9 +1612,9 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
         responseVO.setPremiumYear(CommonUtil.isNullOrZero(performanceForecast.get("totalFYPYear"))?0:performanceForecast.get("totalFYPYear").doubleValue());
         responseVO.setCommissionYear(CommonUtil.isNullOrZero(performanceForecast.get("totalFYCYear"))?0:performanceForecast.get("totalFYCYear").doubleValue());
         responseVO.setPiecesYear(CommonUtil.isNullOrZero(performanceForecast.get("totalPiecesYear"))?0:performanceForecast.get("totalPiecesYear").doubleValue());
-        responseVO.setAchievementRateYear(achievementRateMap.get("achievementRateYear"));
-        responseVO.setAchievementRateQuarter(achievementRateMap.get("achievementRateQuarter"));
-        responseVO.setAchievementRateMonth(achievementRateMap.get("achievementRateMonth"));
+        responseVO.setAchievementRateYear(CommonUtil.isNullOrZero(achievementRateMap.get("achievementRateYear"))?0D: achievementRateMap.get("achievementRateYear"));
+        responseVO.setAchievementRateQuarter(CommonUtil.isNullOrZero(achievementRateMap.get("achievementRateQuarter"))?0D:achievementRateMap.get("achievementRateQuarter"));
+        responseVO.setAchievementRateMonth(CommonUtil.isNullOrZero(achievementRateMap.get("achievementRateMonth"))?0D:achievementRateMap.get("achievementRateMonth"));
         responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
         return responseVO;
     }
@@ -1902,20 +1902,26 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
         }
 
         //年完成率
-        Double achievementRateYear = performanceForecast.get("totalFYCYear")
-                .divide(BigDecimal.valueOf(yearGoal),4,BigDecimal.ROUND_HALF_UP)
-                .doubleValue();
-        achievementRateMap.put("achievementRateYear",achievementRateYear);
+        if (!CommonUtil.isNullOrZero(performanceForecast.get("totalFYCYear"))){
+            Double achievementRateYear = performanceForecast.get("totalFYCYear")
+                    .divide(BigDecimal.valueOf(yearGoal),4,BigDecimal.ROUND_HALF_UP)
+                    .doubleValue();
+            achievementRateMap.put("achievementRateYear",achievementRateYear);
+        }
         //季完成率
-        Double achievementRateQuarter = performanceForecast.get("totalFYCQuarter")
-                .divide(BigDecimal.valueOf(quarterGoal),4,BigDecimal.ROUND_HALF_UP)
-                .doubleValue();
-        achievementRateMap.put("achievementRateQuarter",achievementRateQuarter);
+        if (!CommonUtil.isNullOrZero(performanceForecast.get("totalFYCQuarter"))){
+            Double achievementRateQuarter = performanceForecast.get("totalFYCQuarter")
+                    .divide(BigDecimal.valueOf(quarterGoal),4,BigDecimal.ROUND_HALF_UP)
+                    .doubleValue();
+            achievementRateMap.put("achievementRateQuarter",achievementRateQuarter);
+        }
         //月完成率
-        Double achievementRateMonth = performanceForecast.get("totalFYCMonth")
-                .divide(BigDecimal.valueOf(monthGoal),4,BigDecimal.ROUND_HALF_UP)
-                .doubleValue();
-        achievementRateMap.put("achievementRateMonth",achievementRateMonth);
+        if (!CommonUtil.isNullOrZero(performanceForecast.get("totalFYCMonth"))){
+            Double achievementRateMonth = performanceForecast.get("totalFYCMonth")
+                    .divide(BigDecimal.valueOf(monthGoal),4,BigDecimal.ROUND_HALF_UP)
+                    .doubleValue();
+            achievementRateMap.put("achievementRateMonth",achievementRateMonth);
+        }
         return achievementRateMap;
     }
 

yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml

@@ -742,7 +742,7 @@
       sum(case when to_days(t.track_time)=to_days(now()) then t.track_score end) scoreDay,
       sum(case when YEARWEEK(date_format(t.track_time,'%Y-%m-%d')) = YEARWEEK(now()) then t.track_score end) scoreWeek,
       sum(case when date_format(t.track_time,'%Y-%m')=date_format(now(),'%Y-%m') then t.track_score end) scoreMonth,
-      count(case when YEARWEEK(date_format(a.created_at,'%Y-%m-%d')) = YEARWEEK(now()) then t.id end) addOpportunityNum
+      count(DISTINCT case when YEARWEEK(date_format(a.created_at,'%Y-%m-%d')) = YEARWEEK(now()) then a.id end) addOpportunityNum
     from ag_acl_practitioner p
       left join ag_mkt_leads_assigned_track t on p.id = t.practitioner_id
       left join  ag_mkt_leads_assigneds a on a.id = t.leads_assigned_id