sop任务过期

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

@@ -229,7 +229,10 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
     List<FsCourseUserStatisticsListVO> selectFsCourseUserStatisticsListVO(FsCourseUserStatisticsListParam param);
 
     @Select({"<script> " +
-            "select MIN(o.create_time) createTime,ANY_VALUE(qu.qw_user_name) qwUserName ,ext.name externalUserName,ext.create_time userCreateTime from fs_course_watch_log o LEFT JOIN qw_user qu on qu.id=o.qw_user_id LEFT JOIN qw_external_contact ext ON ext.id =  o.qw_external_contact_id where log_type=2 and o.company_id=#{companyId} " +
+            "select MIN(o.create_time) createTime,ANY_VALUE(qu.qw_user_name) qwUserName ,ext.name externalUserName,ext.avatar," +
+            "   ext.create_time userCreateTime from fs_course_watch_log o " +
+            "LEFT JOIN qw_user qu on qu.id=o.qw_user_id " +
+            "LEFT JOIN qw_external_contact ext ON ext.id =  o.qw_external_contact_id where log_type=2 and o.company_id=#{companyId} " +
             "<if test= 'sTime != null '> " +
             "       and DATE(o.create_time) &gt;= DATE(#{sTime})\n" +
             "</if>\n" +

fs-service/src/main/java/com/fs/course/vo/FsCourseOverVO.java

@@ -12,6 +12,11 @@ public class FsCourseOverVO {
 
     @Excel(name = "企微客户")
     private String qwUserName;
+
+    @Excel(name = "客户头像")
+    private String avatar;
+
+
     @Excel(name = "企业微信员工名称")
     private String externalUserName;
 

fs-service/src/main/java/com/fs/sop/mapper/QwSopLogsMapper.java

@@ -281,6 +281,9 @@ public interface QwSopLogsMapper extends BaseMapper<QwSopLogs> {
     @DataSource(DataSourceType.SOP)
     void deleteQwSopLogsByDate();
 
+    @DataSource(DataSourceType.SOP)
+    void updateQwSopLogsByDayBefore();
+
     @DataSource(DataSourceType.SOP)
     int updateQwSopLogsByDeleted(@Param("data")GetQwSopLogsByJsApiParam param);
 

fs-service/src/main/resources/mapper/sop/QwSopLogsMapper.xml

@@ -519,7 +519,7 @@
                 LEFT JOIN qw_sop qs ON qs.id = ql.sop_id
         WHERE
             ql.log_type = 2
-          AND ql.send_type IN (2, 5)
+          AND ql.send_type IN (2,5,11)
           AND ql.send_status = 3
           AND ql.receiving_status = 0
           AND ql.send_time <= now()
@@ -725,6 +725,16 @@
             DELETE FROM qw_sop_logs WHERE DATE(send_time) < CURDATE() - INTERVAL 2 DAY;
         ]]>
     </delete>
+
+
+    <update id="updateQwSopLogsByDayBefore"  useGeneratedKeys="false">
+        UPDATE qw_sop_logs
+        SET send_status = 5,
+            remark = '清除跨天待发送'
+        WHERE send_time  &lt; CURRENT_DATE() and send_status=3
+    </update>
+
+
     <select id="selectQwSopLogsListByChatSopId" resultType="com.fs.sop.vo.QwSopLogsListCVO">
         SELECT * FROM qw_sop_logs
         <where>