学习进度概览统计完善

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/StatisticsLearningProgressController.java

@@ -15,6 +15,7 @@ import vip.xiaonuo.disk.service.StatisticsLearningProgressService;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -61,12 +62,12 @@ public class StatisticsLearningProgressController {
     @ApiOperationSupport(order = 1)
     @ApiOperation("学习进度-访问人数趋势")
     @GetMapping("/disk/learningprogress/viewTendency")
-    public CommonResult<Map<String,Object>> viewTendency( HttpServletRequest req) {
+    public CommonResult<List<Map<String,Object>>> viewTendency( HttpServletRequest req) {
         Map param =new HashMap();
         param.put("courseId", req.getParameter("courseId"));
         param.put("startTime", req.getParameter("startTime"));
         param.put("endTime", req.getParameter("endTime"));
-        Map<String,Object> result=statisticsLearningProgressService.viewTendency(param);
+        List<Map<String,Object>> result=statisticsLearningProgressService.viewTendency(param);
         return CommonResult.data(result);
     }
 
@@ -79,10 +80,10 @@ public class StatisticsLearningProgressController {
     @ApiOperationSupport(order = 1)
     @ApiOperation("学习进度-练习平均提交数")
     @GetMapping("/disk/learningprogress/paperSubmeitTendency")
-    public CommonResult<Map<String,Object>> paperSubmeitTendency( HttpServletRequest req) {
+    public CommonResult<List<Map<String,Object>>> paperSubmeitTendency( HttpServletRequest req) {
         Map param =new HashMap();
         param.put("courseId", req.getParameter("courseId"));
-        Map<String,Object> result=statisticsLearningProgressService.paperSubmeitTendency(param);
+        List<Map<String,Object>> result=statisticsLearningProgressService.paperSubmeitTendency(param);
         return CommonResult.data(result);
     }
 
@@ -98,6 +99,8 @@ public class StatisticsLearningProgressController {
     public CommonResult<Page<Map<String,Object>>> studyDetail( HttpServletRequest req) {
         Map param =new HashMap();
         param.put("courseId", req.getParameter("courseId"));
+        param.put("startTime", req.getParameter("startTime"));
+        param.put("endTime", req.getParameter("endTime"));
         Page<Map<String,Object>> list=statisticsLearningProgressService.studyDetail(param);
         return CommonResult.data(list);
     }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/StatisticsLearningProgressMapper.xml

@@ -22,6 +22,12 @@
             <if test="param.courseId!=null and param.courseId != ''">
                 and ci.COURSE_ID=#{param.courseId}
             </if>
+            <if test="param.startTime!=null and param.startTime != ''">
+                and cop.CREATE_TIME &gt;=#{param.startTime}
+            </if>
+            <if test="param.endTime!=null and param.endTime != ''">
+                and cop.CREATE_TIME &lt;=#{param.endTime}
+            </if>
             GROUP BY cop.COURSE_ID
         )t1 ON ci.COURSE_ID =t1.courseId
          LEFT JOIN (
@@ -49,6 +55,12 @@
             <if test="param.courseId!=null and param.courseId != ''">
                 and ci.COURSE_ID=#{param.courseId}
             </if>
+            <if test="param.startTime!=null and param.startTime != ''">
+                and csb.CREATE_TIME &gt;=#{param.startTime}
+            </if>
+            <if test="param.endTime!=null and param.endTime != ''">
+                and csb.CREATE_TIME &lt;=#{param.endTime}
+            </if>
             GROUP BY cc.COURSE_ID
         )t3 ON ci.COURSE_ID =t3.courseId
          LEFT JOIN (
@@ -65,6 +77,12 @@
             <if test="param.courseId!=null and param.courseId != ''">
                 and ci.COURSE_ID=#{param.courseId}
             </if>
+            <if test="param.startTime!=null and param.startTime != ''">
+                and csb.CREATE_TIME &gt;=#{param.startTime}
+            </if>
+            <if test="param.endTime!=null and param.endTime != ''">
+                and csb.CREATE_TIME &lt;=#{param.endTime}
+            </if>
             GROUP BY cc.COURSE_ID
         )t4 ON ci.COURSE_ID =t4.courseId
         WHERE ci.DELETE_FLAG ='NOT_DELETE'

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/StatisticsLearningProgressService.java

@@ -2,6 +2,7 @@ package vip.xiaonuo.disk.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,12 +23,12 @@ public interface StatisticsLearningProgressService {
     /**
      *  学习进度-访问人数趋势
      */
-    Map<String,Object> viewTendency(Map param);
+    List<Map<String,Object>> viewTendency(Map param);
 
     /**
      *  学习进度-练习平均提交数
      */
-    Map<String,Object> paperSubmeitTendency(Map param);
+    List<Map<String,Object>> paperSubmeitTendency(Map param);
 
     /**
      *  学习进度-学习明细数据

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/StatisticsLearningProgressServiceImpl.java

@@ -40,8 +40,9 @@ public class StatisticsLearningProgressServiceImpl implements StatisticsLearning
      *  学习进度-访问人数趋势
      */
     @Override
-    public Map<String,Object> viewTendency(Map param)
+    public List<Map<String,Object>> viewTendency(Map param)
     {
+        List<Map<String,Object> > resultList=new ArrayList();
         Map result=new HashMap();
         String courseId=null;
         if(ObjectUtil.isNotEmpty(param.get("courseId")))courseId=param.get("courseId").toString();
@@ -56,17 +57,20 @@ public class StatisticsLearningProgressServiceImpl implements StatisticsLearning
             viewTendencyParam.put("month",month);
             viewTendencyParam.put("courseId",courseId);
             String viewTendencyNum=statisticsLearningProgressMapper.getViewTendencyNum(param);
-            result.put(month,viewTendencyNum);
+            result.put("month",month);
+            result.put("viewTendencyNum",viewTendencyNum);
+            resultList.add(result);
         }
-        return result;
+        return resultList;
     }
 
     /**
      *  学习进度-练习平均提交数
      */
     @Override
-    public Map<String,Object> paperSubmeitTendency(Map param)
+    public List<Map<String,Object>> paperSubmeitTendency(Map param)
     {
+        List<Map<String,Object> > resultList=new ArrayList();
         Map result=new HashMap();
         String courseId=null;
         if(ObjectUtil.isNotEmpty(param.get("courseId")))courseId=param.get("courseId").toString();
@@ -81,9 +85,11 @@ public class StatisticsLearningProgressServiceImpl implements StatisticsLearning
             viewTendencyParam.put("month",month);
             viewTendencyParam.put("courseId",courseId);
             String SubmeitTendency=statisticsLearningProgressMapper.paperSubmeitTendency(param);
-            result.put(month,SubmeitTendency);
+            result.put("month",month);
+            result.put("SubmeitTendency",SubmeitTendency);
+            resultList.add(result);
         }
-        return result;
+        return resultList;
     }
 
     /**