试题是视频讲解，区域统计

sapi/src/main/java/com/xhkjedu/sapi/controller/region/RAppAnalyzeController.java

@@ -26,10 +26,8 @@ public class RAppAnalyzeController {
 
     @PostMapping("/list_app")
     public ResultVo listApp(@RequestBody RegionParam param){
-        Integer begintime = param.getBegintime();
-        Integer endtime = param.getEndtime();
         Integer level = param.getLevel();
-        N_Utils.validation(new Object[]{level,"学段",1});
+        N_Utils.validation(new Object[]{level,"学段",1,param.getYear(),"学年",1});
         Map map = rAppAnalyzeService.listApp(param);
         return new ResultVo(0,"获取应用统计成功",map);
     }

sapi/src/main/java/com/xhkjedu/sapi/service/region/RSchoolAnalyzeService.java

@@ -319,8 +319,6 @@ public class RSchoolAnalyzeService {
 
     public Map listAccess(RegionParam param) {
         Map map = new HashMap();
-        Integer begintime = param.getBegintime();
-        Integer endtime = param.getEndtime();
         List<Map> access = rSchoolAnalyzeMapper.listAccess(param);
         map.put("access",access);
         Map<Integer, List<Map>> lcollect = access.stream().collect(Collectors.groupingBy(m -> (Integer) m.get("level")));

sapi/src/main/resources/mapper/region/RAppAnalyzeMapper.xml

@@ -5,10 +5,7 @@
     <select id="getLoginNum" resultType="java.lang.Integer">
         select count(ul.ulid)
         from t_school s right join t_user_log ul on s.schoolid=ul.schoolid
-        where s.schoollevel=#{level} and s.schoolstate=1
-        <if test="year!=null and year!=0">
-            and ul.year=#{year}
-        </if>
+        where s.schoollevel=#{level} and s.schoolstate=1 and ul.year=#{year}
         <if test="begintime!=null and begintime!=0">
             and ul.logtime between #{begintime} and #{endtime}
         </if>
@@ -18,10 +15,7 @@
         select m.schoolid,s.schoolname,s.shortname,m.modulecode,count(m.amid)dknum,sum(m.costtime)costtime
         ,(select m2.modulename from t_moduledefault m2 where m2.mabbrevname=m.modulecode limit 1)modulename
         from t_school s right join t_app_monitor m on m.schoolid=s.schoolid
-        where s.schoollevel=#{level} and s.schoolstate=1
-        <if test="year!=null and year!=0">
-            and m.year=#{year}
-        </if>
+        where s.schoollevel=#{level} and s.schoolstate=1 and m.year=#{year}
         <if test="begintime!=null and begintime!=0">
             and m.createtime between #{begintime} and #{endtime}
         </if>

sapi/src/main/resources/mapper/region/RPaperAnalyzeMapper.xml

@@ -7,13 +7,7 @@
       select count(DISTINCT pg.paperid) from t_paper_class pg left join t_paper p on pg.paperid=p.paperid
         LEFT JOIN t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
         left join t_class c on c.classid=pg.classid
-        where s.schoollevel=#{param.level}
-        <if test="param.year!=null and param.year!=0">
-            and c.year=#{param.year}
-        </if>
-        <if test="param.year==null || param.year==0">
-            and c.year=s.year
-        </if>
+        where s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
         <if test="param.begintime!=null and param.begintime!=0">
             and pg.starttime between #{param.begintime} and #{param.endtime}
         </if>
@@ -23,13 +17,7 @@
         select count(DISTINCT g.guideid) from t_guide_group gg left join t_guide g on gg.guideid=g.guideid
         LEFT JOIN t_school s on g.schoolid=s.schoolid and gg.schoolid=s.schoolid
         left join t_class c on c.classid=gg.classid
-        where s.schoollevel=#{param.level}
-        <if test="param.year!=null and param.year!=0">
-            and c.year=#{param.year}
-        </if>
-        <if test="param.year==null || param.year==0">
-            and c.year=s.year
-        </if>
+        where s.schoollevel=#{param.level} and s.schoolstate=1 and g.year=#{param.year}
         <if test="param.begintime!=null and param.begintime!=0">
             and g.createtime between #{param.begintime} and #{param.endtime}
         </if>
@@ -39,32 +27,20 @@
        select count(DISTINCT rg.reciteid) from t_recite_group rg left join t_recite r on rg.reciteid=r.reciteid
         LEFT JOIN t_school s on r.schoolid=s.schoolid and rg.schoolid=s.schoolid
         left join t_class c on c.classid=rg.classid
-        where s.schoollevel=#{param.level}
-        <if test="param.year!=null and param.year!=0">
-            and c.year=#{param.year}
-        </if>
-        <if test="param.year==null || param.year==0">
-            and c.year=s.year
-        </if>
+        where s.schoollevel=#{param.level} and s.schoolstate=1 and r.year=#{param.year}
         <if test="param.begintime!=null and param.begintime!=0">
             and rg.starttime between #{param.begintime} and #{param.endtime}
         </if>
     </select>
     <!--作业数量统计——错题视频数量-->
     <select id="getRegionPaperNumQueexp" resultType="java.lang.Integer">
-       select count(distinct qe.qcpid) from t_question_explain qe left join t_question_class qc on qe.questionid=qe.questionid
-      left JOIN t_school s on qc.schoolid=s.schoolid
-      left join t_class c on c.classid=qc.classid
-      where s.schoollevel=#{param.level}
+        select count(distinct qe.qcpid) from t_question_explain qe left join t_question_class qc on qe.questionid=qe.questionid
+        left JOIN t_school s on qc.schoolid=s.schoolid
+        left join t_class c on c.classid=qc.classid
+        where s.schoollevel=#{param.level} and s.schoolstate=1 and qe.year=#{param.year}
         <if test="param.begintime!=null and param.begintime!=0">
             and qe.createtime between #{param.begintime} and #{param.endtime}
         </if>
-        <if test="param.year!=null and param.year!=0">
-            and c.year=#{param.year}
-        </if>
-        <if test="param.year==null || param.year==0">
-            and c.year=s.year
-        </if>
     </select>
 
     <!--作业各类率统计-->
@@ -82,7 +58,6 @@
             <result column="paperscore" property="paperscore"></result>
             <result column="stuscore" property="stuscore"></result>
         </collection>
-
     </resultMap>
     <!--作业各类率统计——作业-->
     <select id="listRegionSchoolRatePaper" resultMap="rpaperMap">
@@ -95,13 +70,7 @@
         left join t_paper_student ps on ps.paperid=p.paperid and ps.classid=pg.classid
         left join t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
         left join t_class c on c.classid=pg.classid
-        where s.schoollevel=#{param.level}
-        <if test="param.year!=null and param.year!=0">
-            and c.year=#{param.year}
-        </if>
-        <if test="param.year==null || param.year==0">
-            and c.year=s.year
-        </if>
+        where s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
         <if test="param.begintime!=null and param.begintime!=0">
             and pg.starttime between #{param.begintime} and #{param.endtime}
         </if>
@@ -117,13 +86,7 @@
         left join t_recite_student rs on rs.reciteid=r.reciteid and rs.classid=rg.classid
         left join t_school s on r.schoolid=s.schoolid and rg.schoolid=s.schoolid
         left join t_class c on c.classid=rg.classid
-        where s.schoollevel=#{param.level}
-        <if test="param.year!=null and param.year!=0">
-            and c.year=#{param.year}
-        </if>
-        <if test="param.year==null || param.year==0">
-            and c.year=s.year
-        </if>
+        where s.schoollevel=#{param.level} and s.schoolstate=1 and r.year=#{param.year}
         <if test="param.begintime!=null and param.begintime!=0">
             and rg.starttime between #{param.begintime} and #{param.endtime}
         </if>
@@ -139,13 +102,7 @@
         left join t_guide_group_student ggs on ggs.guideid=g.guideid and ggs.classid=gg.classid
         left join t_school s on s.schoolid=g.schoolid and s.schoolid=gg.schoolid
         left join t_class c on c.classid=gg.classid
-        where s.schoollevel=#{param.level}
-        <if test="param.year!=null and param.year!=0">
-            and c.year=#{param.year}
-        </if>
-        <if test="param.year==null || param.year==0">
-            and c.year=s.year
-        </if>
+        where s.schoollevel=#{param.level} and s.schoolstate=1 and g.year=#{param.year}
         <if test="param.begintime!=null and param.begintime!=0">
             and g.createtime between #{param.begintime} and #{param.endtime}
         </if>
@@ -161,13 +118,7 @@
         left join t_school s on p.schoolid=s.schoolid and pg.schoolid=s.schoolid
         left join t_paper_student ps on pg.paperid=ps.paperid and pg.classid=ps.classid and ps.psstate!=0
         left join t_class c on c.classid=pg.classid
-        where s.schoollevel=#{param.level}
-        <if test="param.year!=null and param.year!=0">
-            and c.year=#{param.year}
-        </if>
-        <if test="param.year==null || param.year==0">
-            and c.year=s.year
-        </if>
+        where s.schoollevel=#{param.level} and s.schoolstate=1 and p.year=#{param.year}
         <if test="param.begintime!=null and param.begintime!=0">
             and pg.starttime between #{param.begintime} and #{param.endtime}
         </if>
@@ -182,13 +133,7 @@
         left join t_guide g on gs.guideid=g.guideid
         left join t_school s on g.schoolid=s.schoolid and gs.schoolid=s.schoolid
         left join t_class c on c.classid=gs.classid
-        where s.schoollevel=#{param.level} and gs.readtime>0
-        <if test="param.year!=null and param.year!=0">
-            and c.year=#{param.year}
-        </if>
-        <if test="param.year==null || param.year==0">
-            and c.year=s.year
-        </if>
+        where s.schoollevel=#{param.level} and s.schoolstate=1 and gs.readtime>0 and g.year=#{param.year}
         <if test="param.begintime!=null and param.begintime!=0">
             and g.createtime between #{param.begintime} and #{param.endtime}
         </if>

sapi/src/main/resources/mapper/region/RSchoolAnalyzeMapper.xml

@@ -50,9 +50,6 @@
         select s.schoolid,s.schoolname,s.shortname,ceil(ifnull(count(l.ulid)/count(distinct u.userid),0))num,s.schoollevel level
         from t_school s left join t_user u on u.schoolid=s.schoolid and u.usertype in(1,2)
         left join t_user_log l on u.userid=l.userid and s.year=l.year
-        <if test="param.begintime!=null and param.begintime!=0 and param.endtime!=null and param.endtime!=0">
-            and l.logtime between #{param.begintime} and #{param.endtime}
-        </if>
         where s.schoolstate=1 and s.year=#{param.year}
         group by s.schoolid order by num desc
     </select>

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/question/QuestionClassMapper.java

@@ -81,4 +81,7 @@ public interface QuestionClassMapper extends TkMapper<TQuestionClass> {
 
     //删除作业错题
     void deleteQuestionByPaperId(Integer paperid);
+
+    //取上传视频讲解老师归属学校年份
+    Integer getYearBySchoolTeacherid(@Param("userid") Integer userid);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/model/question/TQuestionExplain.java

@@ -45,4 +45,7 @@ public class TQuestionExplain extends BaseBean {
 
     //上传时间
     private Integer createtime;
+
+    //学校年份
+    private Integer year;
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/QuestionClassService.java

@@ -212,6 +212,8 @@ public class QuestionClassService {
     public void addExplain(TQuestionExplain explain) {
         explain.setCreatetime(N_Utils.getSecondTimestamp());
         explain.setReadcount(0);
+        int schoolyear = questionClassMapper.getYearBySchoolTeacherid(explain.getCreateid());
+        explain.setYear(schoolyear);
         questionExplainMapper.insertUseGeneratedKeys(explain);
         explain.setQcpid(explain.getId());
         convertVideo(explain);//视频转换mq

sstudy/src/main/resources/mapper/question/QuestionClassMapper.xml

@@ -273,4 +273,9 @@
         delete from t_question_class where paperid=#{paperid};
         delete from t_question_student where paperid=#{paperid} and errornum=1;
     </delete>
+
+    <!--获取上传视频讲解老师归属学校年份-->
+    <select id="getYearBySchoolTeacherid" resultType="java.lang.Integer">
+        select s.`year` from t_school s left join t_user u on s.schoolid=u.schoolid where u.userid=#{userid} limit 1
+    </select>
 </mapper>