鸿德堂-V1.2 漏斗图未发送成功人数修改

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -1141,7 +1141,10 @@ public class FsUserServiceImpl implements IFsUserService {
     public List<FsUserGraphicStatisticsVO> graphicStatisticsDetailsV2(Long companyUserId, Long videoId, Long periodId) {
         Map<String, Object> result = fsUserMapper.countCourseInviteFunnel(companyUserId, videoId, periodId);
         List<FsUserGraphicStatisticsVO> list = new LinkedList<>();
-        list.add(new FsUserGraphicStatisticsVO("邀请看课人数（未发送成功人" + toInt(result.get("sendFailed")) + "+发送成功" + toInt(result.get("sendSuccess")) + "人）", toInt(result.get("inviteTotal")), toInt(result.get("inviteTotal"))));
+        int inviteTotal = toInt(result.get("inviteTotal"));
+        int sendSuccess = toInt(result.get("sendSuccess"));
+        int sendFailed = inviteTotal - sendSuccess;
+        list.add(new FsUserGraphicStatisticsVO("邀请看课人数（未发送成功人" + sendFailed + "+发送成功" + sendSuccess + "人）", inviteTotal, inviteTotal));
         list.add(new FsUserGraphicStatisticsVO("未看课" + toInt(result.get("notWatched")) + "人", toInt(result.get("notWatched")), toInt(result.get("notWatched"))));
         list.add(new FsUserGraphicStatisticsVO("未完播" + toInt(result.get("watchingIncomplete")) + "人", toInt(result.get("watchingIncomplete")),toInt(result.get("watchingIncomplete"))));
         list.add(new FsUserGraphicStatisticsVO("完播" + toInt(result.get("watchedComplete")) + "人", toInt(result.get("watchedComplete")), toInt(result.get("watchedComplete"))));

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -2743,7 +2743,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             COUNT(DISTINCT d.user_id) AS inviteTotal,
             COUNT(DISTINCT CASE WHEN d.status = 0 AND d.send_status = 1 THEN d.user_id END) AS sendSuccess,
-            COUNT(DISTINCT CASE WHEN d.status = 1 OR d.send_status = 2 THEN d.user_id END) AS sendFailed,
             COUNT(DISTINCT CASE WHEN d.status = 0 AND d.send_status = 1 AND w.log_id IS NULL THEN d.user_id END) AS notWatched,
             COUNT(DISTINCT CASE WHEN w.log_type IN (1, 4) THEN d.user_id END) AS watchingIncomplete,
             COUNT(DISTINCT CASE WHEN w.log_type = 2 THEN d.user_id END) AS watchedComplete,