看课记录导出

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

@@ -75,6 +75,13 @@ public class FsCourseWatchLogListVO extends BaseEntity
     @Excel(name = "所属销售")
     private String companyUserName;
 
+    @Excel(name = "所属sop任务")
+    private String sopId;
+
+    @Excel(name = "营期时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date campPeriodTime;
+
     /** 所属团队 */
 //    @Excel(name = "所属团队")
     private String companyName;
@@ -105,9 +112,6 @@ public class FsCourseWatchLogListVO extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
 
-    @Excel(name = "营期时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date campPeriodTime;
 
     @Excel(name = "进线时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

fs-service/src/main/resources/application-druid-sxjz.yml

@@ -165,4 +165,6 @@ openIM:
     secret: openIM123
     userID: imAdmin
 #是否为新商户，新商户不走mpOpenId
-isNewWxMerchant: true
+isNewWxMerchant: false
+
+enableRedPackAccount: 0

fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -756,6 +756,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         l.video_id,
         l.qw_user_id,
         l.qw_external_contact_id,
+        l.sop_id,
         qec.create_time as qec_create_time
         FROM
         fs_course_watch_log l LEFT JOIN qw_external_contact qec on l.qw_external_contact_id = qec.id