Prechádzať zdrojové kódy

feat(admin): 新增课程、营期、视频三级联动查询接口

- 新增 courseList 接口用于查询所有课程列表- 新增 period 接口支持根据课程ID和营期名称模糊查询营期列表
- 新增 videoList 接口支持根据营期ID查询视频列表
- 修改原 videoList 接口路径为 qwvideoList 并调整实现逻辑
- 新增 qwcourseList 接口用于企微用户绑定课程场景
- 新增 sopInfo 接口提供总后台查询所有企微SOP下拉列表- 优化分页查询逻辑并移除不必要的分页参数
- 调整 QwSopLogsMapper 中查询限制数量从30改为10
xw 1 týždeň pred
rodič
commit
225b3b0d81

+ 38 - 2
fs-admin/src/main/java/com/fs/course/controller/FsCourseRedPacketLogController.java

@@ -142,8 +142,43 @@ public class FsCourseRedPacketLogController extends BaseController
         return toAjax(fsCourseRedPacketLogService.deleteFsCourseRedPacketLogByLogIds(logIds));
     }
 
+    /**
+     * 查询课程列表(三级联动第一级)
+     */
     @GetMapping("/courseList")
     public R courseList()
+    {
+        // 总后台查询所有课程,不受公司限制
+        List<OptionsVO> optionsVOS = fsUserCourseMapper.selectFsUserCourseAllList();
+        return R.ok().put("list", optionsVOS);
+    }
+
+    /**
+     * 根据课程ID和营期名称模糊查询营期列表(三级联动第二级)
+     */
+    @GetMapping("/period")
+    public R getPeriodListLikeName(String periodName, Long courseId)
+    {
+        // 总后台查询所有营期,传入null表示不限制公司
+        List<OptionsVO> list = fsCourseRedPacketLogService.getPeriodListLikeName(periodName, courseId, null);
+        return R.ok().put("data", list);
+    }
+
+    /**
+     * 根据营期ID查询视频列表(三级联动第三级)
+     */
+    @GetMapping(value = "/videoList/{id}")
+    public R videoList(@PathVariable("id") Long id)
+    {
+        List<OptionsVO> optionsVOS = fsUserCourseVideoMapper.selectVideoListByPeriodId(id);
+        return R.ok().put("list", optionsVOS);
+    }
+
+    /**
+     * 查询课程列表(企微用户绑定课程)
+     */
+    @GetMapping("/qwcourseList")
+    public R qwcourseList()
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long userId = loginUser.getUser().getUserId();
@@ -158,8 +193,9 @@ public class FsCourseRedPacketLogController extends BaseController
         return R.ok().put("list", optionsVOS);
     }
 
-    @GetMapping(value = "/videoList/{id}")
-    public R videoList(@PathVariable("id") Long id)
+
+    @GetMapping(value = "/qwvideoList/{id}")
+    public R qwvideoList(@PathVariable("id") Long id)
     {
         List<OptionsVO> optionsVOS = fsUserCourseVideoMapper.selectFsUserCourseVodeAllList(id);
         return R.ok().put("list", optionsVOS);

+ 12 - 0
fs-admin/src/main/java/com/fs/qw/controller/QwSopController.java

@@ -222,4 +222,16 @@ public class QwSopController extends BaseController
         List<SopVoiceListVo> list = qwSopService.getSopVoiceList(id);
         return getDataTable(list);
     }
+
+    /**
+     * 查询所有企微sop下拉列表
+     */
+    @GetMapping("/info")
+    public TableDataInfo sopInfo(QwSop qwSop)
+    {
+        startPage();
+        // 总后台查询所有SOP,不限制公司
+        List<QwSop> qwSops = qwSopService.selectAllQwSopInfo(qwSop);
+        return getDataTable(qwSops);
+    }
 }

+ 1 - 6
fs-company/src/main/java/com/fs/company/controller/company/CompanyUserController.java

@@ -511,17 +511,12 @@ public class CompanyUserController extends BaseController {
      * @return  list
      */
     @GetMapping("/getCompanyUserListLikeName")
-    public R getCompanyUserListLikeName(@RequestParam(required = false) String name,
-                                        @RequestParam(required = false, defaultValue = "1") Integer pageNum,
-                                        @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+    public R getCompanyUserListLikeName(@RequestParam(required = false) String name) {
         Map<String,Object> params = new HashMap<>();
         params.put("nickName", name);
         //查询多条数据传入公司
-        if (pageSize>=200){
             LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
             params.put("companyId", loginUser.getCompany().getCompanyId());
-        }
-        PageHelper.startPage(pageNum, pageSize);
         List<OptionsVO> companyUserList = companyUserService.selectCompanyUserListByMap(params);
         return R.ok().put("data", new PageInfo<>(companyUserList));
     }

+ 1 - 1
fs-service/src/main/resources/mapper/sop/QwSopLogsMapper.xml

@@ -861,6 +861,6 @@
         <![CDATA[
           and ql.send_time <= now()
         ]]>
-        order by ql.sort DESC ,ql.send_time asc limit 30
+        order by ql.sort DESC ,ql.send_time asc limit 10
     </select>
 </mapper>