add

fs-service-system/src/main/java/com/fs/course/domain/FsCourseRedPacketLog.java

@@ -59,4 +59,6 @@ public class FsCourseRedPacketLog extends BaseEntity
     /** 营期id */
     private Long periodId;
 
+    private String result;
+
 }

fs-service-system/src/main/resources/mapper/course/FsCourseRedPacketLogMapper.xml

@@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="watchLogId"    column="watch_log_id"    />
         <result property="remark"    column="remark"    />
+        <result property="result"    column="result"    />
     </resultMap>
 
     <sql id="selectFsCourseRedPacketLogVo">
-        select log_id,watch_log_id, remark,out_batch_no,status,update_time,course_id, user_id, video_id, company_user_id, company_id, amount, create_time, qw_user_id from fs_course_red_packet_log
+        select log_id,watch_log_id,result, remark,out_batch_no,status,update_time,course_id, user_id, video_id, company_user_id, company_id, amount, create_time, qw_user_id from fs_course_red_packet_log
     </sql>
 
     <select id="selectFsCourseRedPacketLogList" parameterType="FsCourseRedPacketLog" resultMap="FsCourseRedPacketLogResult">
@@ -111,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="watchLogId != null">watch_log_id,</if>
             <if test="remark != null">remark,</if>
             <if test="periodId != null">period_id,</if>
+            <if test="result != null">result,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="courseId != null">#{courseId},</if>
@@ -127,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="watchLogId != null">#{watchLogId},</if>
             <if test="remark != null">#{remark},</if>
             <if test="periodId != null">#{periodId},</if>
+            <if test="result != null">#{result},</if>
          </trim>
     </insert>
 
@@ -147,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="watchLogId != null">watch_log_id = #{watchLogId},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="periodId != null">period_id = #{periodId},</if>
+            <if test="result != null">result = #{result},</if>
         </trim>
         where log_id = #{logId}
     </update>

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

@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFsCourseWatchLogListVOexport" resultType="com.fs.course.vo.FsCourseWatchLogListVO">
         select l.log_id,
         l.project as project,
-        l.user_id,uc.course_name,v.title as video_name,u.nick_name as fsNickName, u.avatar as fsAvatar,
+        l.user_id,uc.course_name,v.title as video_name,u.nickname as fsNickName, u.avatar as fsAvatar,
         l.log_type,SEC_TO_TIME(l.duration) as duration,c.company_name,l.camp_period_time,l.finish_time,
         cu.nick_name as company_user_name ,l.send_type,l.create_time,l.update_time,l.last_heartbeat_time,c.company_id
         from fs_course_watch_log l