Merge remote-tracking branch 'origin/bjcz_his_scrm' into bjcz_his_scrm

fs-company-app/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -111,18 +111,29 @@ public class FsUserCourseVideoController extends AppBaseController {
     }
 
     @Login
-    @PostMapping("/courseList")
-    @ApiOperation("获取营期下拉列表")
-    public ResponseResult<PageInfo<FsUserCourseListVO>> getAllCourseList(@Valid @RequestBody FsUserCourseListParam param) {
-        log.info("查询营期列表 - 参数: trainingCampId={}, companyId={}, keyword={}, pageNum={}, pageSize={}", 
-            param.getTrainingCampId(), getCompanyId(), param.getKeyword(), param.getPageNum(), param.getPageSize());
-        
+    @GetMapping("/courseList")
+    @ApiOperation("获取课程下拉列表")
+    public ResponseResult<PageInfo<FsUserCourseListVO>> getAllCourseList(FsUserCourseListParam param) {
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
         param.setCompanyId(getCompanyId());
-        
         List<FsUserCourseListVO> fsUserCourseList = fsUserCourseService.getFsUserCourseList(param);
+        PageInfo<FsUserCourseListVO> pageInfo = new PageInfo<>(fsUserCourseList);
+        return ResponseResult.ok(pageInfo);
+    }
+
+
+    @Login
+    @PostMapping("/list")
+    @ApiOperation("获取营期下拉列表")
+    public ResponseResult<PageInfo<FsUserCourseListVO>> getAllList(@Valid @RequestBody FsUserCourseListParam param) {
+        log.info("查询营期列表 - 参数: trainingCampId={}, companyId={}, keyword={}, pageNum={}, pageSize={}",
+                param.getTrainingCampId(), getCompanyId(), param.getKeyword(), param.getPageNum(), param.getPageSize());
+
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        param.setCompanyId(getCompanyId());
+        List<FsUserCourseListVO> fsUserCourseList = fsUserCourseService.getFsUserList(param);
         log.info("查询营期列表 - 结果数量: {}", fsUserCourseList.size());
-        
+
         PageInfo<FsUserCourseListVO> pageInfo = new PageInfo<>(fsUserCourseList);
         return ResponseResult.ok(pageInfo);
     }

fs-company/src/main/java/com/fs/user/FsUserAdminController.java

@@ -174,7 +174,7 @@ public class FsUserAdminController extends BaseController {
     /**
      * 修改用户
      */
-    @PreAuthorize("@ss.hasPermi('user:fsUser:edit')")
+//    @PreAuthorize("@ss.hasPermi('user:fsUser:edit')")
     @Log(title = "用户", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody FsUser fsUser)

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

@@ -272,6 +272,26 @@ public interface FsUserCourseMapper
             "</if>" +
             "ORDER BY fcp.create_time DESC, fcp.period_status ASC"+
             "</script>"})
+    List<FsUserCourseListVO> getFsUserList(FsUserCourseListParam param);
+
+    @Select({"<script> " +
+            "SELECT DISTINCT\n" +
+            "        fcp.period_id,\n" +
+            "        fcp.period_name\n" +
+            "        FROM\n" +
+            "        fs_user_course_period fcp\n" +
+            "        LEFT JOIN fs_user_course_period_days fcpd ON fcpd.period_id = fcp.period_id\n" +
+            "        LEFT JOIN fs_user_course c ON c.course_id = fcpd.course_id\n" +
+            "        WHERE\n" +
+            "        c.is_del = 0 and fcp.del_flag = '0'\n" +
+            "        AND FIND_IN_SET(#{companyId}, fcp.company_id)\n" +
+            "        <if test=\"keyword != null and keyword !='' \">\n" +
+            "            AND fcp.period_name LIKE concat('%',#{keyword},'%'\n" +
+            "            )\n" +
+            "        </if>\n" +
+            "        ORDER BY\n" +
+            "        fcp.create_time desc, fcp.period_status asc"+
+            "</script>"})
     List<FsUserCourseListVO> getFsUserCourseList(FsUserCourseListParam param);
 
     @Select("select course_id ,img_url   from fs_user_course where is_del = 0 and is_private = 1")

fs-service/src/main/java/com/fs/course/service/IFsUserCourseService.java

@@ -13,6 +13,7 @@ import com.fs.course.vo.*;
 import com.fs.course.vo.newfs.FsUserCourseListVO;
 import com.fs.his.vo.OptionsVO;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -107,7 +108,7 @@ public interface IFsUserCourseService
 
     List<FsUserCourseListPVO> selectFsUserCourseListCompanyPVO(FsUserCourseParam fsUserCourse);
 
-    List<FsUserCourseListVO> getFsUserCourseList(FsUserCourseListParam param);
+    List<FsUserCourseListVO> getFsUserList(FsUserCourseListParam param);
 
     void  processQwSopCourseMaterialTimer();
 
@@ -134,4 +135,6 @@ public interface IFsUserCourseService
     List<FsUserCourseVideoAppletVO> selectFsUserCourseVideoAppletListByCourseId(Long courseId);
 
     R createAppCourseSortLink(FsCourseLinkCreateParam fsCourseLinkCreateParam);
+
+    List<FsUserCourseListVO> getFsUserCourseList(@Valid FsUserCourseListParam param);
 }

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

@@ -478,6 +478,11 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
         return fsUserCourseMapper.selectFsUserCourseListCompanyPVO(fsUserCourse);
     }
 
+    @Override
+    public List<FsUserCourseListVO> getFsUserList(FsUserCourseListParam param) {
+        return fsUserCourseMapper.getFsUserList(param);
+    }
+
     @Override
     public List<FsUserCourseListVO> getFsUserCourseList(FsUserCourseListParam param) {
         return fsUserCourseMapper.getFsUserCourseList(param);
@@ -762,7 +767,6 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
         return R.error("生成链接失败！");
     }
 
-
     private Graphics2D initializeGraphics(BufferedImage combined) {
         Graphics2D graphics = combined.createGraphics();
         graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);

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

@@ -1567,7 +1567,13 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         if(fsUserCoursePeriodDays != null && !fsUserCoursePeriodDays.isEmpty()){
             periodDays = fsUserCoursePeriodDays.get(0);
         }
-        if(periodDays != null && periodDays.getLastJoinTime() !=null && LocalDateTime.now().isAfter(periodDays.getLastJoinTime())) {
+        
+        // 检查是否开启自由模式
+        FsUserCoursePeriod period = fsUserCoursePeriodMapper.selectFsUserCoursePeriodById(param.getPeriodId());
+        boolean isFreeMode = (period != null && period.getFreeMode() != null && period.getFreeMode() == 1);
+        
+        // 只有在非自由模式下才检查红包领取时间限制
+        if(!isFreeMode && periodDays != null && periodDays.getLastJoinTime() !=null && LocalDateTime.now().isAfter(periodDays.getLastJoinTime())) {
             return R.error(403,"已超过领取红包时间");
         }