Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

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

@@ -108,8 +108,8 @@ public interface QwWatchLogMapper extends BaseMapper<QwWatchLog>{
 
     List<QwWatchLogStatisticsListVO> selectQwWatchLogByCompanyUserId(
                                             @Param("companyUserIds") List<Long> companyUserIds,
-                                                                     @Param("sTime") Date sTime,
-                                                                     @Param("dTime") Date dTime,
+                                                                     @Param("sTime") String sTime,
+                                                                     @Param("dTime") String dTime,
                                                                      @Param("project") Long project,
                                                                      @Param("courseId") Long courseId,
                                                                      @Param("videoId") Long videoId,
@@ -118,8 +118,8 @@ public interface QwWatchLogMapper extends BaseMapper<QwWatchLog>{
     );
     Long selectQwWatchLogByCompanyUserIdCount(
             @Param("companyUserIds") List<Long> companyUserIds,
-            @Param("sTime") Date sTime,
-            @Param("dTime") Date dTime,
+            @Param("sTime") String sTime,
+            @Param("dTime") String dTime,
             @Param("project") Long project,
             @Param("courseId") Long courseId,
             @Param("videoId") Long videoId

fs-service-system/src/main/java/com/fs/qw/param/QwWatchLogStatisticsListParam.java

@@ -1,6 +1,7 @@
 package com.fs.qw.param;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.utils.DateUtils;
 import lombok.Data;
 
 import java.util.Date;
@@ -11,6 +12,18 @@ public class QwWatchLogStatisticsListParam {
     private Date eTime;
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date sTime;
+
+    private String startDate;
+    private String endDate;
+
+    public String getStartDate() {
+        return DateUtils.getStartOfDayString(sTime);
+    }
+
+    public String getEndDate() {
+        return DateUtils.getEndOfDayString(eTime);
+    }
+
     private String nickName;
     private String corpId;
     private Long companyId;

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

@@ -186,7 +186,7 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
         // 统计销售下面的所有记录
         List<QwWatchLogStatisticsListVO> vos = qwWatchLogMapper
                 .selectQwWatchLogByCompanyUserId(userIds
-                , param.getSTime(),param.getETime(),param.getProject(),param.getCourseId(),param.getVideoId(),param.getPageNum(),param.getPageSize());
+                , param.getStartDate(),param.getEndDate(),param.getProject(),param.getCourseId(),param.getVideoId(),param.getPageNum(),param.getPageSize());
 
         for (QwWatchLogStatisticsListVO item : vos) {
             Company company = companyCacheService.selectCompanyById(item.getCompanyId());
@@ -221,7 +221,7 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
         // 获取总记录数
         Long total = qwWatchLogMapper
                 .selectQwWatchLogByCompanyUserIdCount(userIds
-                        , param.getSTime(), param.getETime(), param.getProject(), param.getCourseId(), param.getVideoId());
+                        , param.getStartDate(), param.getEndDate(), param.getProject(), param.getCourseId(), param.getVideoId());
 
 
 

fs-service-system/src/main/resources/mapper/hy/HyWatchLogMapper.xml

@@ -19,19 +19,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, ext_id, qw_user_id,line_time, status, day, project, create_time from hy_watch_log
     </sql>
     <insert id="insertHyWatchLogBatch">
-        INSERT INTO hy_work_task (
+        INSERT INTO hy_watch_log (
         ext_id,
         qw_user_id,
         status,
-        type,
-        title,
-        remark,
-        score,
-        sop_id,
+        day,
+        project,
         company_id,
         company_user_id,
         create_time,
-        update_time
+        line_time,
+        course_id,
+        video_id
         )
         VALUES
         <foreach collection="hyWatchLogs" item="log" separator=",">
@@ -39,15 +38,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{log.extId},
             #{log.qwUserId},
             #{log.status},
-            #{log.type},
-            #{log.title},
-            #{log.remark},
-            #{log.score},
-            #{log.sopId},
+            #{log.day},
+            #{log.project},
             #{log.companyId},
             #{log.companyUserId},
             #{log.createTime},
-            #{log.updateTime}
+            #{log.lineTime},
+            #{log.courseId},
+            #{log.videoId}
             )
         </foreach>
     </insert>

fs-service-system/src/main/resources/mapper/qw/QwWatchLogMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             COUNT(CASE WHEN day = 1 and status in (1,2) THEN 1 END) AS d1Online,
             COUNT(CASE WHEN day = 1 and status=2 THEN 1 END) AS d1Over,
             COUNT(1) AS line,project,course_id,video_id,company_id
-             from qw_watch_log
+             from hy_watch_log
              <where>
                  <if test="companyUserIds != null and companyUserIds.size() != 0">
                      and company_user_id in
@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             COUNT(CASE WHEN day = 30 and status in (1,2) THEN 1 END) AS d30Online,
             COUNT(CASE WHEN day = 30 and status=2 THEN 1 END) AS d30Over,
             COUNT(1) AS line,project,course_id,video_id
-             from qw_watch_log
+             from hy_watch_log
             <where>
                  <if test="companyUserIds != null">
                      and company_user_id in
@@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT COUNT(*)
         FROM (
         SELECT 1
-        FROM qw_watch_log
+        FROM hy_watch_log
         <where>
             <if test="companyUserIds != null and companyUserIds.size() != 0">
                 and company_user_id in
@@ -205,7 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectQwWatchLogAllStatisticsListVONewCount" resultType="java.lang.Long">
         select
         count(1)
-        from qw_watch_log
+        from hy_watch_log
         <where>
             <if test="companyUserId">
                 and company_user_id in