Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -1733,7 +1733,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         sopLogs.setSendType(3);
         sopLogs.setSendStatus(3L);
         sopLogs.setReceivingStatus(0L);
-        sopLogs.setSort(4);
+        sopLogs.setSort(40000000);
         sopLogs.setCompanyId(finishLog.getCompanyId());
         sopLogs.setSopId(finishLog.getSopId());
         sopLogs.setExternalUserId(externalContact.getExternalUserId());

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

@@ -91,13 +91,13 @@ public interface FsCourseFinishTempMapper
     List<FsCourseFinishTempListVO> selectFsCourseFinishTempListVO(@Param("maps") FsCourseFinishTemp fsCourseFinishTemp);
 
     @Select("select * from fs_course_finish_temp where video_id = #{videoId} " +
-            "and find_in_set(#{userId},company_user_ids) and is_del= 0 order by create_time desc  limit 1 ")
+            "and find_in_set(#{userId},company_user_ids) and is_del= 0 AND status= 1 order by create_time desc  limit 1 ")
     FsCourseFinishTemp selectFsCourseFinishTempByCompanyUserId(@Param("userId") Long companyUserId, @Param("videoId")Long videoId);
 
     @Select("    SELECT *\n" +
             "    FROM fs_course_finish_temp\n" +
             "    WHERE video_id = #{videoId}\n" +
-            "    AND is_del = 0\n" +
+            "    AND is_del = 0 AND status= 1 \n" +
             "    AND (\n" +
             "        (is_all_company_user = 1 AND company_id = #{companyId})\n" +
             "        OR\n" +

fs-service/src/main/java/com/fs/course/service/impl/FsCourseFinishTempParentServiceImpl.java

@@ -20,7 +20,7 @@ import com.fs.course.service.IFsCourseFinishTempParentService;
 
 /**
  * 完课模板Service业务层处理
- * 
+ *
  * @author 吴树波
  * @date 2025-05-22
  */
@@ -34,7 +34,7 @@ public class FsCourseFinishTempParentServiceImpl extends ServiceImpl<FsCourseFin
 
     /**
      * 查询完课模板
-     * 
+     *
      * @param id 完课模板主键
      * @return 完课模板
      */
@@ -46,7 +46,7 @@ public class FsCourseFinishTempParentServiceImpl extends ServiceImpl<FsCourseFin
 
     /**
      * 查询完课模板列表
-     * 
+     *
      * @param fsCourseFinishTempParent 完课模板
      * @return 完课模板
      */
@@ -58,7 +58,7 @@ public class FsCourseFinishTempParentServiceImpl extends ServiceImpl<FsCourseFin
 
     /**
      * 新增完课模板
-     * 
+     *
      * @param fsCourseFinishTempParent 完课模板
      * @return 结果
      */
@@ -73,7 +73,7 @@ public class FsCourseFinishTempParentServiceImpl extends ServiceImpl<FsCourseFin
         videoList.forEach(e -> {
             FsCourseFinishTemp temp = new FsCourseFinishTemp();
             temp.setName(e.getFileName());
-            temp.setStatus(fsCourseFinishTempParent.getStatus());
+            temp.setStatus(0L);
             temp.setSetting(fsCourseFinishTempParent.getSetting());
             temp.setChatSetting(fsCourseFinishTempParent.getChatSetting());
             temp.setCompanyId(fsCourseFinishTempParent.getCompanyId());
@@ -89,7 +89,7 @@ public class FsCourseFinishTempParentServiceImpl extends ServiceImpl<FsCourseFin
 
     /**
      * 修改完课模板
-     * 
+     *
      * @param fsCourseFinishTempParent 完课模板
      * @return 结果
      */
@@ -102,7 +102,7 @@ public class FsCourseFinishTempParentServiceImpl extends ServiceImpl<FsCourseFin
 
     /**
      * 批量删除完课模板
-     * 
+     *
      * @param ids 需要删除的完课模板主键
      * @return 结果
      */
@@ -115,7 +115,7 @@ public class FsCourseFinishTempParentServiceImpl extends ServiceImpl<FsCourseFin
 
     /**
      * 删除完课模板信息
-     * 
+     *
      * @param id 完课模板主键
      * @return 结果
      */