区域统计学年搜索

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

@@ -29,7 +29,7 @@ public class RAppAnalyzeController {
         Integer begintime = param.getBegintime();
         Integer endtime = param.getEndtime();
         Integer level = param.getLevel();
-        N_Utils.validation(new Object[]{level,"学段",1,begintime,"开始时间",1,endtime,"结束时间",1});
+        N_Utils.validation(new Object[]{level,"学段",1});
         Map map = rAppAnalyzeService.listApp(level,begintime, endtime);
         return new ResultVo(0,"获取应用统计成功",map);
     }

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

@@ -28,10 +28,8 @@ public class RPaperAnalyzeController {
     //作业试题统计
     @PostMapping("/pnum")
     public ResultVo getResourceQuestionNum(@RequestBody RegionParam param){
-        Integer begintime = param.getBegintime();
-        Integer endtime = param.getEndtime();
         Integer level = param.getLevel();
-        N_Utils.validation(new Object[]{level,"学段",1,begintime,"开始时间",1,endtime,"结束时间",1});
+        N_Utils.validation(new Object[]{level,"学段",1});
         Map map = rPaperAnalyzeService.getRegionPaperNum(param);
         return new ResultVo(0,"获取作业数量统计成功",map);
     }
@@ -39,10 +37,8 @@ public class RPaperAnalyzeController {
     //作业率统计--作业
     @PostMapping("/ratep")
     public ResultVo listRegionSchoolRatePaper(@RequestBody RegionParam param){
-        Integer begintime = param.getBegintime();
-        Integer endtime = param.getEndtime();
         Integer level = param.getLevel();
-        N_Utils.validation(new Object[]{level,"学段",1,begintime,"开始时间",1,endtime,"结束时间",1});
+        N_Utils.validation(new Object[]{level,"学段",1});
         Map map = rPaperAnalyzeService.listRegionSchoolRatePaper(param);
         return new ResultVo(0,"获取作业率统计成功",map);
     }
@@ -50,10 +46,8 @@ public class RPaperAnalyzeController {
     //作业率统计--背诵
     @PostMapping("/rater")
     public ResultVo listRegionSchoolRateRecite(@RequestBody RegionParam param){
-        Integer begintime = param.getBegintime();
-        Integer endtime = param.getEndtime();
         Integer level = param.getLevel();
-        N_Utils.validation(new Object[]{level,"学段",1,begintime,"开始时间",1,endtime,"结束时间",1});
+        N_Utils.validation(new Object[]{level,"学段",1});
         Map map = rPaperAnalyzeService.listRegionSchoolRateRecite(param);
         return new ResultVo(0,"获取背诵率统计成功",map);
     }
@@ -61,10 +55,8 @@ public class RPaperAnalyzeController {
     //作业率统计--预习率
     @PostMapping("/ratepre")
     public ResultVo getRegionSchoolRatePreview(@RequestBody RegionParam param){
-        Integer begintime = param.getBegintime();
-        Integer endtime = param.getEndtime();
         Integer level = param.getLevel();
-        N_Utils.validation(new Object[]{level,"学段",1,begintime,"开始时间",1,endtime,"结束时间",1});
+        N_Utils.validation(new Object[]{level,"学段",1});
         Map map = rPaperAnalyzeService.getRegionSchoolRatePreview(param);
         return new ResultVo(0,"获取预习率统计成功",map);
     }
@@ -72,20 +64,16 @@ public class RPaperAnalyzeController {
     //人均作业用时
     @PostMapping("/avgp")
     public ResultVo listRegionSchoolUsetimePaper(@RequestBody RegionParam param){
-        Integer begintime = param.getBegintime();
-        Integer endtime = param.getEndtime();
         Integer level = param.getLevel();
-        N_Utils.validation(new Object[]{level,"学段",1,begintime,"开始时间",1,endtime,"结束时间",1});
+        N_Utils.validation(new Object[]{level,"学段",1});
         List<Map> lst= rPaperAnalyzeService.listRegionSchoolUsetimePaper(param);
         return new ResultVo(0,"获取人均作业用时成功",lst);
     }
     //人均预习用时
     @PostMapping("/avgpre")
     public ResultVo listRegionSchoolUsetimePreview(@RequestBody RegionParam param){
-        Integer begintime = param.getBegintime();
-        Integer endtime = param.getEndtime();
         Integer level = param.getLevel();
-        N_Utils.validation(new Object[]{level,"学段",1,begintime,"开始时间",1,endtime,"结束时间",1});
+        N_Utils.validation(new Object[]{level,"学段",1});
         List<Map> lst= rPaperAnalyzeService.listRegionSchoolUsetimePreview(param);
         return new ResultVo(0,"获取人均预习用时成功",lst);
     }

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

@@ -26,10 +26,8 @@ public class RRoomAnalyzeController {
 
     @PostMapping("/list_room")
     public ResultVo listRoom(@RequestBody RegionParam param){
-        Integer begintime = param.getBegintime();
-        Integer endtime = param.getEndtime();
         Integer level = param.getLevel();
-        N_Utils.validation(new Object[]{level,"学段",1,begintime,"开始时间",1,endtime,"结束时间",1});
+        N_Utils.validation(new Object[]{level,"学段",1});
         Map map = rRoomAnalyzeService.listRoom(param);
         return new ResultVo(0,"获取课堂统计成功",map);
     }

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

@@ -6,7 +6,9 @@
         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
-        and ul.logtime between #{begintime} and #{endtime}
+        <if test="begintime!=null and begintime!=0">
+            and ul.logtime between #{begintime} and #{endtime}
+        </if>
     </select>
     <!--学校应用时长、次数统计-->
     <select id="listApp" resultType="com.xhkjedu.sapi.vo.region.RAppVo">
@@ -14,7 +16,9 @@
         ,(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
-        and m.createtime between #{begintime} and #{endtime}
+        <if test="begintime!=null and begintime!=0">
+            and m.createtime between #{begintime} and #{endtime}
+        </if>
         group by m.schoolid,m.modulecode
     </select>
 </mapper>

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

@@ -7,7 +7,10 @@
       select count(DISTINCT pg.paperid) from t_paper_group pg left join t_paper p on pg.paperid=p.paperid
         LEFT JOIN t_school s on p.schoolid=s.schoolid
         left join t_class c on c.classid=pg.classid
-        where s.schoollevel=#{param.level} and pg.starttime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level}
+        <if test="param.begintime!=null and param.begintime!=0">
+            and pg.starttime between #{param.begintime} and #{param.endtime}
+        </if>
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>
@@ -20,7 +23,10 @@
         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
         left join t_class c on c.classid=gg.classid
-        where s.schoollevel=#{param.level} and g.createtime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level}
+        <if test="param.begintime!=null and param.begintime!=0">
+            and g.createtime between #{param.begintime} and #{param.endtime}
+        </if>
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>
@@ -33,7 +39,10 @@
        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
         left join t_class c on c.classid=rg.classid
-        where s.schoollevel=#{param.level} and rg.starttime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level}
+        <if test="param.begintime!=null and param.begintime!=0">
+            and rg.starttime between #{param.begintime} and #{param.endtime}
+        </if>
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>
@@ -46,7 +55,10 @@
        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 qe.createtime between #{param.begintime} and #{param.endtime}
+      where s.schoollevel=#{param.level}
+        <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>
@@ -83,7 +95,10 @@
         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
         left join t_class c on c.classid=pg.classid
-        where s.schoollevel=#{param.level} and pg.starttime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level}
+        <if test="param.begintime!=null and param.begintime!=0">
+            and pg.starttime between #{param.begintime} and #{param.endtime}
+        </if>
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>
@@ -102,7 +117,10 @@
         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
         left join t_class c on c.classid=rg.classid
-        where s.schoollevel=#{param.level} and rg.starttime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level}
+        <if test="param.begintime!=null and param.begintime!=0">
+            and rg.starttime between #{param.begintime} and #{param.endtime}
+        </if>
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>
@@ -121,7 +139,10 @@
         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
         left join t_class c on c.classid=gg.classid
-        where s.schoollevel=#{param.level} and g.createtime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level}
+        <if test="param.begintime!=null and param.begintime!=0">
+            and g.createtime between #{param.begintime} and #{param.endtime}
+        </if>
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>
@@ -139,7 +160,10 @@
          from t_paper_student ps
         left join t_school s on ps.schoolid=s.schoolid
         left join t_class c on c.classid=ps.classid
-        where s.schoollevel=#{param.level} and ps.stoptime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level}
+        <if test="param.begintime!=null and param.begintime!=0">
+            and ps.stoptime between #{param.begintime} and #{param.endtime}
+        </if>
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>
@@ -157,7 +181,10 @@
         left join t_guide g on gs.guideid=g.guideid
         left join t_school s on g.schoolid=s.schoolid
         left join t_class c on c.classid=gs.classid
-        where s.schoollevel=#{param.level} and gs.readtime between #{param.begintime} and #{param.endtime} and gs.readtime>0
+        where s.schoollevel=#{param.level} and gs.readtime>0
+        <if test="param.begintime!=null and param.begintime!=0">
+            and gs.readtime between #{param.begintime} and #{param.endtime}
+        </if>
         <if test="param.year!=null and param.year!=0">
             and c.year=#{param.year}
         </if>

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

@@ -31,7 +31,9 @@
         <if test="param.year==null || param.year==0">
             and c.year=s.year
         </if>
-        and r.createtime between #{param.begintime} and #{param.endtime}
+        <if test="param.begintime!=null and param.begintime!=0">
+            and r.createtime between #{param.begintime} and #{param.endtime}
+        </if>
         group by r.roomid
     </select>
 </mapper>

scommons/src/main/java/com/xhkjedu/utils/N_Utils.java

@@ -124,6 +124,7 @@ public class N_Utils {
 
     //计算两个时间戳相差的天数
     public static Integer getTimestampDay(Integer begintime,Integer endtime){
+        if(isEmptyInteger(begintime)) return 365;//默认时间差为一年
         Integer day = 0;
 
         Integer cha = endtime - begintime;