Merge remote-tracking branch 'origin/master'

fs-company/src/main/java/com/fs/qw/QwQwWorkTaskController.java

@@ -36,7 +36,7 @@ import java.util.List;
 public class QwQwWorkTaskController extends BaseController
 {
     @Autowired
-    private IHyWorkTaskService qwWorkTaskService;
+    private IHyWorkTaskService hyWorkTaskService;
     @Autowired
     private TokenService tokenService;
     @Autowired
@@ -53,7 +53,7 @@ public class QwQwWorkTaskController extends BaseController
         if(ObjectUtils.isNull(qwWorkTask.getCompanyUserId())) {
             qwWorkTask.setCompanyUserId(loginUser.getUser().getUserId());
         }
-        List<QwWorkTaskListVO> list = qwWorkTaskService.selectQwWorkTaskListVONew(qwWorkTask);
+        List<QwWorkTaskListVO> list = hyWorkTaskService.selectHyWorkTaskListVONew(qwWorkTask);
         for (QwWorkTaskListVO qwWorkTaskListVO : list) {
             qwWorkTaskListVO.setLogs(fsCourseWatchLogMapper.selectFsCourseWatchLog7DayByExtId(qwWorkTaskListVO.getExtId()));
         }
@@ -61,7 +61,7 @@ public class QwQwWorkTaskController extends BaseController
         rspData.setCode(HttpStatus.SUCCESS);
         rspData.setMsg("查询成功");
         rspData.setRows(list);
-        rspData.setTotal(qwWorkTaskService.selectQwWorkTaskListVONewCount(qwWorkTask));
+        rspData.setTotal(hyWorkTaskService.selectHyWorkTaskListVONewCount(qwWorkTask));
         return rspData;
     }
 
@@ -73,7 +73,7 @@ public class QwQwWorkTaskController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(QwWorkTask qwWorkTask)
     {
-        List<QwWorkTask> list = qwWorkTaskService.selectQwWorkTaskList(qwWorkTask);
+        List<QwWorkTask> list = hyWorkTaskService.selectHyWorkTaskList(qwWorkTask);
         ExcelUtil<QwWorkTask> util = new ExcelUtil<QwWorkTask>(QwWorkTask.class);
         return util.exportExcel(list, "企微任务看板数据");
     }
@@ -85,7 +85,7 @@ public class QwQwWorkTaskController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return AjaxResult.success(qwWorkTaskService.selectQwWorkTaskById(id));
+        return AjaxResult.success(hyWorkTaskService.selectHyWorkTaskById(id));
     }
 
     /**
@@ -96,7 +96,7 @@ public class QwQwWorkTaskController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody QwWorkTask qwWorkTask)
     {
-        return toAjax(qwWorkTaskService.insertQwWorkTask(qwWorkTask));
+        return toAjax(hyWorkTaskService.insertHyWorkTask(qwWorkTask));
     }
 
     /**
@@ -112,7 +112,7 @@ public class QwQwWorkTaskController extends BaseController
         task.setRemark(qwWorkTask.getRemark());
         task.setStatus(1);
         task.setUpdateTime(new Date());
-        return toAjax(qwWorkTaskService.updateQwWorkTask(task));
+        return toAjax(hyWorkTaskService.updateHyWorkTask(task));
     }
 
     /**
@@ -123,6 +123,6 @@ public class QwQwWorkTaskController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(qwWorkTaskService.deleteQwWorkTaskByIds(ids));
+        return toAjax(hyWorkTaskService.deleteHyWorkTaskByIds(ids));
     }
 }

fs-service-system/src/main/java/com/fs/course/mapper/FsCourseWatchLogMapper.java

@@ -237,7 +237,7 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
 
     @Select("SELECT l.qw_external_contact_id,l.log_type,l.qw_user_id,l.create_time ,u.first_time,u.create_time lineTime FROM fs_course_watch_log  l " +
             "LEFT JOIN qw_external_contact u ON u.id=l.qw_external_contact_id  " +
-            " WHERE  DATE(l.create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) and l.video_id =#{videoId}")
+            " WHERE l.send_type=2 AND DATE(l.create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) and l.video_id =#{videoId}")
     List<FsQwCourseWatchLogVO> selectFsCourseWatchLogByNoDayAndVoidId(Long videoId);
     @Select("SELECT l.qw_external_contact_id,l.log_type,l.qw_user_id,l.create_time ,u.first_time,u.create_time lineTime FROM fs_course_watch_log  l " +
             "LEFT JOIN qw_external_contact u ON u.id=l.qw_external_contact_id  " +