总后台报表统计

fs-company/src/main/java/com/fs/company/controller/course/FsUserCourseTrainingCampController.java

@@ -33,6 +33,7 @@ public class FsUserCourseTrainingCampController {
 
     private final IFsUserCourseTrainingCampService fsUserCourseTrainingCampService;
     private final TokenService tokenService;
+
     /**
      * 查询训练营列表
      */
@@ -42,8 +43,7 @@ public class FsUserCourseTrainingCampController {
                            @RequestParam(required = false) String userId,
                            @RequestParam String scs,
                            @RequestParam(required = false, defaultValue = "1") Integer pageNum,
-                           @RequestParam(required = false, defaultValue = "10") Integer pageSize)
-    {
+                           @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Map<String, Object> params = new HashMap<>();
         params.put("trainingCampName", trainingCampName);
@@ -55,4 +55,16 @@ public class FsUserCourseTrainingCampController {
         return AjaxResult.success(new PageInfo<>(list));
     }
 
+    @GetMapping("/getCampListLikeName")
+    public R getCampListLikeName(@RequestParam(required = false) String name,
+                                 @RequestParam(required = false, defaultValue = "1") Integer pageNum,
+                                 @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("name", name);
+
+        PageHelper.startPage(pageNum, pageSize);
+        List<OptionsVO> campList = fsUserCourseTrainingCampService.selectCampListByMap(params);
+        return R.ok().put("data", new PageInfo<>(campList));
+
+    }
 }

fs-company/src/main/java/com/fs/hisStore/controller/FsStoreStatisticsScrmController.java

@@ -4,11 +4,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.TimeUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyUserService;
+import com.fs.course.param.FsCourseWatchLogStatisticsListParam;
+import com.fs.course.service.IFsCourseWatchLogService;
 import com.fs.framework.service.TokenService;
 import com.fs.hisStore.param.FsStoreStatisticsParam;
 import com.fs.hisStore.service.IFsStoreOrderScrmService;
@@ -45,6 +48,9 @@ public class FsStoreStatisticsScrmController extends BaseController
     private IFsStorePaymentScrmService storePaymentService;
     @Autowired
     private TokenService tokenService;
+
+    @Autowired
+    private IFsCourseWatchLogService courseWatchLogService;
     @PreAuthorize("@ss.hasPermi('store:statistics:storeOrder')")
     @GetMapping("/storeOrder")
     public R storeOrder(FsStoreStatisticsParam param)
@@ -184,6 +190,14 @@ public class FsStoreStatisticsScrmController extends BaseController
     }
 
 
+    /**
+     * 会员统计报表
+     */
+    @GetMapping("/userReport")
+    public TableDataInfo userReport(FsCourseWatchLogStatisticsListParam  param){
+        startPage();
+        return getDataTable(courseWatchLogService.selectFsUserReportVO( param));
+    }
 
 
 }