zyp

fs-service/src/main/resources/application-config-druid-fcky.yml

@@ -46,7 +46,7 @@ watch:
   password3: v9xsKuqn_$d2y
 
 fs :
-  commonApi: http://10.206.0.16:80108010
+  commonApi: http://10.206.0.16:8010
   h5CommonApi: http://127.0.0.1:7771
 nuonuo:
   key: 10924508

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

@@ -211,6 +211,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="finishTime != null">finish_time,</if>
             <if test="sendFinishMsg != null">send_finish_msg,</if>
             <if test="campPeriodTime != null">camp_period_time,</if>
+            <if test="periodId != null">period_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
@@ -230,6 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="finishTime != null">#{finishTime},</if>
             <if test="sendFinishMsg != null">#{sendFinishMsg},</if>
             <if test="campPeriodTime != null">#{campPeriodTime},</if>
+            <if test="periodId != null">#{periodId},</if>
         </trim>
     </insert>
 
@@ -344,6 +346,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="finishTime != null">finish_time = #{finishTime},</if>
             <if test="sendFinishMsg != null">send_finish_msg = #{sendFinishMsg},</if>
             <if test="lastHeartbeatTime != null">last_heartbeat_time = #{lastHeartbeatTime},</if>
+            <if test="periodId != null">period_id = #{periodId},</if>
         </trim>
         where log_id = #{logId}
     </update>

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -705,6 +705,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
         WHERE
         (company_user.user_id = #{userId} or company_user.parent_id = #{userId} )
+        and fs_course_red_packet_log.status = 1
         <if test="dateTag != null and dateTag !='' ">
             <choose>
                 <when test = "dateTag == '今天'">