Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/qw/mapper/QwWatchLogMapper.java

@@ -81,7 +81,8 @@ public interface QwWatchLogMapper extends BaseMapper<QwWatchLog>{
             "    COUNT(CASE WHEN qec.`level` = 5 THEN 1 END) AS E,\n" +
             "    COUNT(CASE WHEN qec.fs_user_id IS NOT NULL THEN 1 END) AS sign,\n" +
             "    COUNT(CASE WHEN qec.`status` =3 THEN 1 END) AS los,\n" +
-            "    COUNT(CASE WHEN qec.`status` IN (4, 5,6) THEN 1 END) AS del\n" +
+            "    COUNT(CASE WHEN qec.`status` IN (4, 5,6) THEN 1 END) AS del,\n" +
+            "    COUNT(CASE WHEN qec.fs_user_id IS NOT NULL and qec.fs_user_id != 0 THEN 1 END) AS reg_num\n"+
             "FROM\n" +
             "    qw_external_contact qec\n" +
             "JOIN\n" +
@@ -222,7 +223,7 @@ public interface QwWatchLogMapper extends BaseMapper<QwWatchLog>{
             "    qu.qw_user_name AS qw_user_name, \n" +
             "    DATE(qec.create_time) AS create_time, \n" +
             "    COUNT(1) AS line," +
-            "    COUNT(CASE WHEN fs_user_id IS NOT NULL THEN 1 ELSE NULL END) AS reg_num\n" +
+            "    COUNT(CASE WHEN qec.fs_user_id IS NOT NULL and qec.fs_user_id != 0 THEN 1 END) AS reg_num\n" +
             "FROM\n" +
             "    qw_external_contact qec\n" +
             "JOIN\n" +

fs-service/src/main/java/com/fs/qw/service/impl/QwWatchLogServiceImpl.java

@@ -229,6 +229,7 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
             stat.setCreateTime(vo.getCreateTime());
             stat.setQwUserName(vo.getQwUserName());
             stat.setLine(vo.getLine());
+            stat.setRegNum(vo.getRegNum());
             list.add(stat);
         }
 

fs-service/src/main/java/com/fs/qw/vo/QwWatchLogStatisticsListVO.java

@@ -28,6 +28,10 @@ public class QwWatchLogStatisticsListVO {
      */
     private Long courseId;
     private String courseName;
+    /**
+     * 注册数
+     */
+    private Long regNum;
 
     /**
      * 小节