区域统计、可视化学年数据搜索

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

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

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

@@ -25,8 +25,8 @@ public class RSchoolAnalyzeController {
     private RSchoolAnalyzeService rSchoolAnalyzeService;
 
     @PostMapping("/list_school")
-    public ResultVo listSchool(){
-        Map map = rSchoolAnalyzeService.listSchool();
+    public ResultVo listSchool(RegionParam param){
+        Map map = rSchoolAnalyzeService.listSchool(param);
         return new ResultVo(0,"获取学校列表成功",map);
     }
 
@@ -37,8 +37,8 @@ public class RSchoolAnalyzeController {
     }
 
     @PostMapping("/list_stu")
-    public ResultVo listStu(){
-        Map map = rSchoolAnalyzeService.listStu();
+    public ResultVo listStu(RegionParam param){
+        Map map = rSchoolAnalyzeService.listStu(param);
         return new ResultVo(0,"获取学生列表成功",map);
     }
 

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

@@ -53,14 +53,14 @@ public class RegionAnalyzeController {
     }
 
     @PostMapping("/slist")
-    public ResultVo listSchool(){
-        List<Map> list = regionAnalyzeService.listSchool();
+    public ResultVo listSchool(@RequestBody RegionParam param){
+        List<Map> list = regionAnalyzeService.listSchool(param);
         return new ResultVo(0,"获取学校列表成功",list);
     }
 
     @PostMapping("/ctslist")
-    public ResultVo listClassTeacherStudentNum(){
-        List<Map> list = regionAnalyzeService.listClassTeacherStudentNum();
+    public ResultVo listClassTeacherStudentNum(@RequestBody RegionParam param){
+        List<Map> list = regionAnalyzeService.listClassTeacherStudentNum(param);
         return new ResultVo(0,"获取学段班级、教师、学生总量成功",list);
     }
 
@@ -69,14 +69,14 @@ public class RegionAnalyzeController {
     @PostMapping("/workc")
     public ResultVo listPaperCommitMonth(@RequestBody RegionParam param){
         N_Utils.validation(new Object[]{param.getBegintime(),"开始时间",1,param.getEndtime(),"结束时间",1});
-        Map map = regionAnalyzeService.listPaperCommitMonth(param.getBegintime(),param.getEndtime());
+        Map map = regionAnalyzeService.listPaperCommitMonth(param);
         return new ResultVo(0,"获取教学统计作业提交率成功",map);
     }
     //教学统计--各教学任务
     @PostMapping("/work")
     public ResultVo listGuideCommitMonth(@RequestBody RegionParam param){
         N_Utils.validation(new Object[]{param.getBegintime(),"开始时间",1,param.getEndtime(),"结束时间",1});
-        List<WorkRtnVo> map = regionAnalyzeService.listWorkCommitMonth(param.getBegintime(),param.getEndtime());
+        List<WorkRtnVo> map = regionAnalyzeService.listWorkCommitMonth(param);
         return new ResultVo(0,"获取各教学任务统计信息成功",map);
     }
 
@@ -84,7 +84,7 @@ public class RegionAnalyzeController {
     @PostMapping("/papernum")
     public ResultVo listPapernumMonth(@RequestBody RegionParam param){
         N_Utils.validation(new Object[]{param.getBegintime(),"开始时间",1,param.getEndtime(),"结束时间",1});
-        Map map = regionAnalyzeService.listPapernumMonth(param.getBegintime(),param.getEndtime());
+        Map map = regionAnalyzeService.listPapernumMonth(param);
         return new ResultVo(0,"获取布置作业次数成功",map);
     }
 
@@ -92,7 +92,7 @@ public class RegionAnalyzeController {
     @PostMapping("/roomnum")
     public ResultVo listRoomNumMonth(@RequestBody RegionParam param){
         N_Utils.validation(new Object[]{param.getBegintime(),"开始时间",1,param.getEndtime(),"结束时间",1});
-        Map map = regionAnalyzeService.listRoomNumMonth(param.getBegintime(),param.getEndtime());
+        Map map = regionAnalyzeService.listRoomNumMonth(param);
         return new ResultVo(0,"获取课堂使用数量成功",map);
     }
 
@@ -100,7 +100,7 @@ public class RegionAnalyzeController {
     @PostMapping("/roomask")
     public ResultVo listRoomAskNumMonth(@RequestBody RegionParam param){
         N_Utils.validation(new Object[]{param.getBegintime(),"开始时间",1,param.getEndtime(),"结束时间",1});
-        List<Map> map = regionAnalyzeService.listRoomAskNumMonth2(param.getBegintime(),param.getEndtime());
+        List<Map> map = regionAnalyzeService.listRoomAskNumMonth2(param);
         return new ResultVo(0,"获取课堂互动数量成功",map);
     }
 

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

@@ -62,7 +62,7 @@ public class SAnalyzeController {
     public ResultVo listClassTeacherStudentNum(@RequestBody SchoolParams param){
         Integer schoolid = param.getSchoolid();
         N_Utils.validation(new Object[]{schoolid,"学校id",1});
-        Map map = sAnalyzeService.listClassTeacherStudentNum(schoolid);
+        Map map = sAnalyzeService.listClassTeacherStudentNum(param);
         return new ResultVo(0,"获取班级、教师、学生总量成功",map);
     }
 
@@ -94,7 +94,7 @@ public class SAnalyzeController {
         Integer begintime = param.getBegintime();
         Integer endtime = param.getEndtime();
         N_Utils.validation(new Object[]{schoolid,"学校id",1,begintime,"开始时间",1,endtime,"结束时间",1});
-        List<Map> map = sAnalyzeService.listPaperCommitMonth(schoolid, begintime, endtime);
+        List<Map> map = sAnalyzeService.listPaperCommitMonth(param);
         return new ResultVo(0,"获取教学统计作业提交率成功",map);
     }
     //教学统计--预习提交率
@@ -104,7 +104,7 @@ public class SAnalyzeController {
         Integer begintime = param.getBegintime();
         Integer endtime = param.getEndtime();
         N_Utils.validation(new Object[]{schoolid,"学校id",1,begintime,"开始时间",1,endtime,"结束时间",1});
-        List<Map> map = sAnalyzeService.listGuideCommitMonth(schoolid, begintime, endtime);
+        List<Map> map = sAnalyzeService.listGuideCommitMonth(param);
         return new ResultVo(0,"获取教学任务预习统计信息成功",map);
     }
 
@@ -115,7 +115,7 @@ public class SAnalyzeController {
         Integer begintime = param.getBegintime();
         Integer endtime = param.getEndtime();
         N_Utils.validation(new Object[]{schoolid,"学校id",1,begintime,"开始时间",1,endtime,"结束时间",1});
-        Map map = sAnalyzeService.listRoomNumMonth(schoolid, begintime, endtime);
+        Map map = sAnalyzeService.listRoomNumMonth(param);
         return new ResultVo(0,"获取课堂使用数量成功",map);
     }
 
@@ -126,7 +126,7 @@ public class SAnalyzeController {
         Integer begintime = param.getBegintime();
         Integer endtime = param.getEndtime();
         N_Utils.validation(new Object[]{schoolid,"学校id",1,begintime,"开始时间",1,endtime,"结束时间",1});
-        List<Map> map = sAnalyzeService.listRoomAskNumMonth(schoolid, begintime, endtime);
+        List<Map> map = sAnalyzeService.listRoomAskNumMonth(param);
         return new ResultVo(0,"获取课堂互动数量成功",map);
     }
 

sapi/src/main/java/com/xhkjedu/sapi/controller/system/SchoolController.java

@@ -188,4 +188,17 @@ public class SchoolController {
         List<Integer> list = schoolService.listYear(schoolid);
         return new ResultVo(0, "获取列表成功", list);
     }
+
+    /*
+     * 获取区域学年列表
+     * @Param []
+     * @Author ywx
+     * @Date 2022/10/14 10:05
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_cyear")
+    public ResultVo listCloudYear() {
+        List<Integer> list = schoolService.listCloudYear();
+        return new ResultVo(0, "获取列表成功", list);
+    }
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/region/RRoomAnalyzeMapper.java

@@ -1,6 +1,7 @@
 package com.xhkjedu.sapi.mapper.region;
 
 import com.xhkjedu.sapi.vo.region.RRoomVo;
+import com.xhkjedu.sapi.vo.region.RegionParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -8,9 +9,5 @@ import java.util.List;
 
 @Repository
 public interface RRoomAnalyzeMapper {
-    List<RRoomVo> listRoom(@Param("level") Integer level, @Param("begintime") Integer begintime, @Param("endtime") Integer endtime);
-
-    //获取学校课堂用时人数统计
-    RRoomVo getRoom(@Param("schoolid") Integer schoolid, @Param("begintime") Integer begintime
-            , @Param("endtime") Integer endtime, @Param("year") Integer year);
+    List<RRoomVo> listRoom(@Param("param") RegionParam param);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/region/RSchoolAnalyzeMapper.java

@@ -2,7 +2,9 @@ package com.xhkjedu.sapi.mapper.region;
 
 import com.xhkjedu.sapi.vo.region.RSStuVo;
 import com.xhkjedu.sapi.vo.region.RSTeacherVo;
+import com.xhkjedu.sapi.vo.region.RegionParam;
 import com.xhkjedu.sapi.vo.region.SchoolVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -11,7 +13,7 @@ import java.util.Map;
 @Repository
 public interface RSchoolAnalyzeMapper {
     //获取学校列表
-    List<SchoolVo> listSchool();
+    List<SchoolVo> listSchool(@Param("param") RegionParam param);
 
     //教师性别统计
     List<RSTeacherVo> listTeacherSex();
@@ -20,7 +22,7 @@ public interface RSchoolAnalyzeMapper {
     List<RSTeacherVo> listTeacherSubject();
 
     //学生统计
-    List<RSStuVo> listStu();
+    List<RSStuVo> listStu(@Param("param") RegionParam param);
 
     //活跃度统计
     List<Map> listAccess(Integer begintime, Integer endtime);

sapi/src/main/java/com/xhkjedu/sapi/mapper/region/RegionAnalyzeMapper.java

@@ -1,9 +1,7 @@
 package com.xhkjedu.sapi.mapper.region;
 
-import com.xhkjedu.sapi.vo.region.CloudVo;
-import com.xhkjedu.sapi.vo.region.RSubjectVo;
-import com.xhkjedu.sapi.vo.region.ResourceTypeVo;
-import com.xhkjedu.sapi.vo.region.WorkVo;
+import com.xhkjedu.sapi.vo.region.*;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -29,27 +27,25 @@ public interface RegionAnalyzeMapper {
     List<RSubjectVo> listQuestionSubjectNum();
 
     //获取学校列表
-    List<Map> listSchool();
+    List<Map> listSchool(@Param("param") RegionParam param);
 
     //获取学段班级、教师、学生总量
-    List<Map> listClassTeacherStudentNum();
+    List<Map> listClassTeacherStudentNum(@Param("param") RegionParam param);
     //近一个月教学统计——作业提交率
-    List<WorkVo> listPaperCommitMonth(Integer begintime, Integer endtime);
+    List<WorkVo> listPaperCommitMonth(@Param("param") RegionParam param);
     //近一个月教学统计——预习提交率
-    List<WorkVo> listGuideCommitMonth(Integer begintime, Integer endtime);
+    List<WorkVo> listGuideCommitMonth(@Param("param") RegionParam param);
     //近一个月教学统计——背诵提交率
-    List<WorkVo> listReciteCommitMonth(Integer begintime, Integer endtime);
+    List<WorkVo> listReciteCommitMonth(@Param("param") RegionParam param);
     //近一个月教学统计——课堂出勤率
-    List<Map> listRoomCommitMonth(Integer begintime, Integer endtime);
+    List<Map> listRoomCommitMonth(@Param("param") RegionParam param);
 
 
     //近一个月布置作业次数
-    List<WorkVo> listPapernumMonth(Integer begintime, Integer endtime);
+    List<WorkVo> listPapernumMonth(@Param("param") RegionParam param);
 
     //近一个月课堂使用情况统计——使用次数
-    List<WorkVo> listRoomNumMonth(Integer begintime, Integer endtime);
+    List<WorkVo> listRoomNumMonth(@Param("param") RegionParam param);
     //近一个月课堂使用情况统计——课堂互动
-    List<WorkVo> listRoomAskNumMonth(Integer begintime, Integer endtime);
-    //近一个月课堂使用情况统计——课堂互动
-    List<Map> listRoomAskNumMonth2(Integer begintime, Integer endtime);
+    List<Map> listRoomAskNumMonth2(@Param("param") RegionParam param);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/region/SAnalyzeMapper.java

@@ -1,6 +1,8 @@
 package com.xhkjedu.sapi.mapper.region;
 
+import com.xhkjedu.sapi.vo.analyze.SchoolParams;
 import com.xhkjedu.sapi.vo.region.AccessVo;
+import com.xhkjedu.sapi.vo.region.RegionParam;
 import com.xhkjedu.sapi.vo.region.ResourceTypeVo;
 import com.xhkjedu.sapi.vo.region.SWorkVo;
 import org.apache.ibatis.annotations.Param;
@@ -30,20 +32,19 @@ public interface SAnalyzeMapper {
     List<ResourceTypeVo> listResourceSubjectNum(Integer schoolid);
 
     //获取班级、教师、学生总量
-    Map listClassTeacherStudentNum(@Param("schoolid") Integer schoolid);
-    List<Map> listClassTeacherStudent(@Param("schoolid") Integer schoolid);
+    List<Map> listClassTeacherStudent(@Param("param") SchoolParams param);
     //近一个月访问统计
     List<AccessVo> listAccess(Integer schoolid, Integer begintime, Integer endtime);
 
     //近一个月应用监控统计
     List<AccessVo> listAppMonitorMonth(Integer schoolid, Integer begintime, Integer endtime);
     //近一个月教学统计——作业提交率
-    List<SWorkVo> listPaperCommitMonth(Integer schoolid, Integer begintime, Integer endtime, Integer year);
+    List<SWorkVo> listPaperCommitMonth(@Param("param") RegionParam param);
     //近一个月教学统计——预习提交率
-    List<SWorkVo> listGuideCommitMonth(Integer schoolid, Integer begintime, Integer endtime, Integer year);
+    List<SWorkVo> listGuideCommitMonth(@Param("param") RegionParam param);
 
     //近一个月课堂使用情况统计——使用次数
-    List<SWorkVo> listRoomNumMonth(Integer schoolid, Integer begintime, Integer endtime, Integer year);
+    List<SWorkVo> listRoomNumMonth(@Param("param") RegionParam param);
     //近一个月课堂使用情况统计——课堂互动
-    List<Map> listRoomAskNumMonth(Integer schoolid, Integer begintime, Integer endtime, Integer year);
+    List<Map> listRoomAskNumMonth(@Param("param") RegionParam param);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/SchoolMapper.java

@@ -63,4 +63,7 @@ public interface SchoolMapper extends TkMapper<TSchool> {
 
     //获取学年列表
     List<Integer> listYear(@Param("schoolid") Integer schoolid);
+
+    //获取区域学年列表
+    List<Integer> listCloudYear();
 }

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

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.service.region;
 
 import com.xhkjedu.sapi.mapper.region.RRoomAnalyzeMapper;
 import com.xhkjedu.sapi.vo.region.RRoomVo;
+import com.xhkjedu.sapi.vo.region.RegionParam;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
@@ -23,11 +24,11 @@ public class RRoomAnalyzeService {
     @Resource
     private RRoomAnalyzeMapper rRoomAnalyzeMapper;
 
-    public Map listRoom(Integer level, Integer begintime, Integer endtime) {
+    public Map listRoom(RegionParam param) {
         Map map = new HashMap();
         //学校课堂使用统计
         List<RRoomVo> list = new ArrayList<>();
-        List<RRoomVo> rooms = rRoomAnalyzeMapper.listRoom(level, begintime, endtime);
+        List<RRoomVo> rooms = rRoomAnalyzeMapper.listRoom(param);
         if (N_Utils.isListNotEmpty(rooms)) {
             Map<Integer, List<RRoomVo>> schoolRoomMap = rooms.stream().collect(Collectors.groupingBy(RRoomVo::getSchoolid));
             for (Map.Entry<Integer, List<RRoomVo>> entry : schoolRoomMap.entrySet()) {
@@ -83,7 +84,7 @@ public class RRoomAnalyzeService {
         Map<Integer, List<RRoomVo>> tscollect = list.stream().collect(Collectors.groupingBy(RRoomVo::getSchoolid));
         for(Map.Entry smap:tscollect.entrySet()) {
             List<RRoomVo> schools = (List<RRoomVo>) smap.getValue();
-            Integer daynum = N_Utils.getTimestampDay(begintime,endtime);//使用天数
+            Integer daynum = N_Utils.getTimestampDay(param.getBegintime(),param.getEndtime());//使用天数
             Integer totaltime = schools.stream().collect(Collectors.summingInt(RRoomVo::getTotaltime));//总用时
             RRoomVo school = schools.get(0);
             String schoolname = school.getSchoolname();

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

@@ -3,6 +3,7 @@ package com.xhkjedu.sapi.service.region;
 import com.xhkjedu.sapi.mapper.cloud.CloudMapper;
 import com.xhkjedu.sapi.mapper.region.RSchoolAnalyzeMapper;
 import com.xhkjedu.sapi.model.cloud.TCloud;
+import com.xhkjedu.sapi.vo.region.RegionParam;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.sapi.vo.region.RSStuVo;
 import com.xhkjedu.sapi.vo.region.RSTeacherVo;
@@ -27,11 +28,11 @@ public class RSchoolAnalyzeService {
     private CloudMapper cloudMapper;
 
     //获取学校列表
-    public Map listSchool() {
+    public Map listSchool(RegionParam param) {
         Map map = new HashMap();
         TCloud cloud = cloudMapper.getCloud();
         map.put("cloudmap",cloud.getCloudmap());
-        List<SchoolVo> schools = rSchoolAnalyzeMapper.listSchool();
+        List<SchoolVo> schools = rSchoolAnalyzeMapper.listSchool(param);
         List<Map> levels = new ArrayList<>();
         /*Map<Object, List<SchoolVo>> schoollevel = schools.stream().collect(Collectors.groupingBy(m -> m.getSchoollevel()));
         for(Map.Entry lmap:schoollevel.entrySet()) {
@@ -210,10 +211,11 @@ public class RSchoolAnalyzeService {
      * @Author ywx
      * @Date 2021/7/9 15:22
      * @return java.util.Map
-     **/
-    public Map listStu() {
+     *
+     * @param param*/
+    public Map listStu(RegionParam param) {
         Map map = new HashMap();
-        List<RSStuVo> students = rSchoolAnalyzeMapper.listStu();
+        List<RSStuVo> students = rSchoolAnalyzeMapper.listStu(param);
         Integer znum = students.size();
         //学生性别统计
         List<Map> sexes = new ArrayList<>();

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

@@ -169,18 +169,18 @@ public class RegionAnalyzeService {
     }
 
     //获取学校列表
-    public List<Map> listSchool() {
-        return regionAnalyzeMapper.listSchool();
+    public List<Map> listSchool(RegionParam param) {
+        return regionAnalyzeMapper.listSchool(param);
     }
 
     //获取学段班级、教师、学生总量
-    public List<Map> listClassTeacherStudentNum() {
-        return regionAnalyzeMapper.listClassTeacherStudentNum();
+    public List<Map> listClassTeacherStudentNum(RegionParam param) {
+        return regionAnalyzeMapper.listClassTeacherStudentNum(param);
     }
 
     //近一个月教学统计
-    public Map listPaperCommitMonth(Integer begintime, Integer endtime) {
-        List<WorkVo> works = regionAnalyzeMapper.listPaperCommitMonth(begintime, endtime);
+    public Map listPaperCommitMonth(RegionParam param) {
+        List<WorkVo> works = regionAnalyzeMapper.listPaperCommitMonth(param);
         Map map = new HashMap();
 
         if (works != null && works.size() > 0) {
@@ -207,13 +207,13 @@ public class RegionAnalyzeService {
     }
 
     //近一个月教学统计--各教学任务
-    public List<WorkRtnVo> listWorkCommitMonth(Integer begintime, Integer endtime) {
+    public List<WorkRtnVo> listWorkCommitMonth(RegionParam param) {
 
         List<WorkRtnVo> rtnmap = new ArrayList<>();
         boolean noexist = false;
 
         //作业
-        List<WorkVo> papers = regionAnalyzeMapper.listPaperCommitMonth(begintime, endtime);
+        List<WorkVo> papers = regionAnalyzeMapper.listPaperCommitMonth(param);
         if (N_Utils.isListNotEmpty(papers)) {
             for (WorkVo w : papers) {
                 List<WorkDetailVo> detials = w.getDetails();
@@ -238,7 +238,7 @@ public class RegionAnalyzeService {
             }
         }
         //课堂考勤
-        List<Map> rooms = regionAnalyzeMapper.listRoomCommitMonth(begintime, endtime);
+        List<Map> rooms = regionAnalyzeMapper.listRoomCommitMonth(param);
         if (N_Utils.isListNotEmpty(rooms)) {
             for (Map map : rooms) {
                 Integer stunum = Integer.parseInt(map.get("stunum").toString());
@@ -262,7 +262,7 @@ public class RegionAnalyzeService {
             }
         }
         //预习
-        List<WorkVo> guides = regionAnalyzeMapper.listGuideCommitMonth(begintime, endtime);
+        List<WorkVo> guides = regionAnalyzeMapper.listGuideCommitMonth(param);
         if (N_Utils.isListNotEmpty(guides)) {
             for (WorkVo w : guides) {
                 List<WorkDetailVo> detials = w.getDetails();
@@ -286,7 +286,7 @@ public class RegionAnalyzeService {
             }
         }
         //背诵
-        List<WorkVo> recites = regionAnalyzeMapper.listReciteCommitMonth(begintime, endtime);
+        List<WorkVo> recites = regionAnalyzeMapper.listReciteCommitMonth(param);
         if (N_Utils.isListNotEmpty(recites)) {
             for (WorkVo w : recites) {
                 List<WorkDetailVo> detials = w.getDetails();
@@ -324,8 +324,8 @@ public class RegionAnalyzeService {
     }
 
     //近一个月布置作业次数
-    public Map listPapernumMonth(Integer begintime, Integer endtime) {
-        List<WorkVo> papers = regionAnalyzeMapper.listPapernumMonth(begintime, endtime);
+    public Map listPapernumMonth(RegionParam param) {
+        List<WorkVo> papers = regionAnalyzeMapper.listPapernumMonth(param);
 
         Map map = new HashMap();
         if (papers != null && papers.size() > 0) {
@@ -347,10 +347,10 @@ public class RegionAnalyzeService {
     }
 
     //近一个月课堂使用情况统计——使用次数
-    public Map listRoomNumMonth(Integer begintime, Integer endtime) {
+    public Map listRoomNumMonth(RegionParam param) {
         Map map = new HashMap();
 
-        List<WorkVo> rooms = regionAnalyzeMapper.listRoomNumMonth(begintime, endtime);
+        List<WorkVo> rooms = regionAnalyzeMapper.listRoomNumMonth(param);
         if (rooms != null && rooms.size() > 0) {
             //最大数量对象
             WorkVo maxnum = rooms.stream().max(Comparator.comparing(WorkVo::getNum)).get();
@@ -367,51 +367,7 @@ public class RegionAnalyzeService {
     }
 
     //近一个月课堂使用情况统计——课堂互动
-    public List<Map> listRoomAskNumMonth(Integer begintime, Integer endtime, Integer year) {
-
-        List<WorkVo> list = regionAnalyzeMapper.listRoomAskNumMonth(begintime, endtime);//课堂互动
-
-        List<WorkVo> rooms = regionAnalyzeMapper.listRoomNumMonth(begintime, endtime);//课堂次数
-        Map<Integer, Integer> roommap = rooms.stream().collect(Collectors.toMap(WorkVo::getSchoolid, WorkVo::getNum));
-
-        //互动类型20抢答21随机点名30判断题31选择题32简答题33画图题40课堂小测
-        List<Map> rtnlist = new ArrayList<>();
-
-        if (list != null && list.size() > 0) {
-            for (WorkVo room : list) {
-                List<WorkTypeVo> asks = room.getAsks();
-
-                //提问次数
-                List<WorkTypeVo> twlist = asks.stream().filter(workTypeVo -> workTypeVo.getAsktype() >= 30).filter(workTypeVo -> workTypeVo.getAsktype() < 40).collect(Collectors.toList());
-                Integer twnum = twlist.stream().mapToInt(WorkTypeVo::getAsknum).sum();
-                //堂测次数
-                List<WorkTypeVo> tclist = asks.stream().filter(workTypeVo -> workTypeVo.getAsktype() == 40).collect(Collectors.toList());
-                Integer tcnum = tclist.stream().mapToInt(WorkTypeVo::getAsknum).sum();
-                //点名次数
-                List<WorkTypeVo> dmlist = asks.stream().filter(workTypeVo -> workTypeVo.getAsktype() == 21).collect(Collectors.toList());
-                Integer dmnum = dmlist.stream().mapToInt(WorkTypeVo::getAsknum).sum();
-                //抢答次数
-                List<WorkTypeVo> qdlist = asks.stream().filter(workTypeVo -> workTypeVo.getAsktype() == 20).collect(Collectors.toList());
-                Integer qdnum = qdlist.stream().mapToInt(WorkTypeVo::getAsknum).sum();
-
-                Map map = new HashMap();
-                map.put("twnum", twnum);
-                map.put("tcnum", tcnum);
-                map.put("dmnum", dmnum);
-                map.put("qdnum", qdnum);
-                map.put("schoolname", room.getSchoolname());
-                map.put("shortname", room.getShortname());
-                map.put("num", roommap.get(room.getSchoolid()));
-
-                rtnlist.add(map);
-            }
-        }
-
-        return rtnlist;
-    }
-
-    //近一个月课堂使用情况统计——课堂互动
-    public List<Map> listRoomAskNumMonth2(Integer begintime, Integer endtime) {
-        return regionAnalyzeMapper.listRoomAskNumMonth2(begintime, endtime);
+    public List<Map> listRoomAskNumMonth2(RegionParam param) {
+        return regionAnalyzeMapper.listRoomAskNumMonth2(param);
     }
 }

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

@@ -1,12 +1,10 @@
 package com.xhkjedu.sapi.service.region;
 
-import com.xhkjedu.sapi.mapper.system.SchoolMapper;
 import com.xhkjedu.sapi.mapper.region.SAnalyzeMapper;
+import com.xhkjedu.sapi.mapper.system.SchoolMapper;
+import com.xhkjedu.sapi.vo.analyze.SchoolParams;
+import com.xhkjedu.sapi.vo.region.*;
 import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.sapi.vo.region.AccessVo;
-import com.xhkjedu.sapi.vo.region.ResourceTypeVo;
-import com.xhkjedu.sapi.vo.region.SAClassVo;
-import com.xhkjedu.sapi.vo.region.SWorkVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -99,10 +97,13 @@ public class SAnalyzeService {
     }
 
     //获取班级、教师、学生总量
-    public Map listClassTeacherStudentNum(Integer schoolid) {
+    public Map listClassTeacherStudentNum(SchoolParams param) {
 //        Map map = sAnalyzeMapper.listClassTeacherStudentNum(schoolid);
         Map map = new HashMap();
-        List<Map> list = sAnalyzeMapper.listClassTeacherStudent(schoolid);
+        if(N_Utils.isEmptyInteger(param.getYear())){
+            param.setYear(schoolMapper.getYearById(param.getSchoolid()));
+        }
+        List<Map> list = sAnalyzeMapper.listClassTeacherStudent(param);
         Map<Integer,List<Map>> grades = list.stream().collect(Collectors.groupingBy(m->(Integer) m.get("gradeid")));
         grades = grades.entrySet().stream().sorted(Map.Entry.comparingByKey())
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (c1, c2) -> c1, LinkedHashMap::new));
@@ -231,16 +232,20 @@ public class SAnalyzeService {
     }
 
     //近一个月作业统计
-    public List<Map> listPaperCommitMonth(Integer schoolid, Integer begintime, Integer endtime) {
-        Integer year = schoolMapper.getYearById(schoolid);
-        List<SWorkVo> works = sAnalyzeMapper.listPaperCommitMonth(schoolid, begintime, endtime, year);
+    public List<Map> listPaperCommitMonth(RegionParam param) {
+        if(N_Utils.isEmptyInteger(param.getYear())) {
+            param.setYear(schoolMapper.getYearById(param.getSchoolid()));
+        }
+        List<SWorkVo> works = sAnalyzeMapper.listPaperCommitMonth(param);
         return getPaperGuide(works);
     }
 
     //近一个月预习统计
-    public List<Map> listGuideCommitMonth(Integer schoolid, Integer begintime, Integer endtime) {
-        Integer year = schoolMapper.getYearById(schoolid);
-        List<SWorkVo> works = sAnalyzeMapper.listGuideCommitMonth(schoolid, begintime, endtime, year);
+    public List<Map> listGuideCommitMonth(RegionParam param) {
+        if(N_Utils.isEmptyInteger(param.getYear())) {
+            param.setYear(schoolMapper.getYearById(param.getSchoolid()));
+        }
+        List<SWorkVo> works = sAnalyzeMapper.listGuideCommitMonth(param);
         return getPaperGuide(works);
     }
 
@@ -269,11 +274,13 @@ public class SAnalyzeService {
     }
 
     //近一个月课堂使用情况统计——使用次数
-    public Map listRoomNumMonth(Integer schoolid, Integer begintime, Integer endtime) {
+    public Map listRoomNumMonth(RegionParam param) {
         Map map = new HashMap();
 
-        Integer year = schoolMapper.getYearById(schoolid);
-        List<SWorkVo> rooms = sAnalyzeMapper.listRoomNumMonth(schoolid, begintime, endtime, year);
+        if(N_Utils.isEmptyInteger(param.getYear())) {
+            param.setYear(schoolMapper.getYearById(param.getSchoolid()));
+        }
+        List<SWorkVo> rooms = sAnalyzeMapper.listRoomNumMonth(param);
         if (rooms != null && rooms.size() > 0) {
             //最大数量对象
             SWorkVo maxnum = rooms.stream().max(Comparator.comparing(SWorkVo::getNum)).get();
@@ -293,8 +300,10 @@ public class SAnalyzeService {
     }
 
     //近一个月课堂使用情况统计——课堂互动
-    public List<Map> listRoomAskNumMonth(Integer schoolid, Integer begintime, Integer endtime) {
-        Integer year = schoolMapper.getYearById(schoolid);
-        return sAnalyzeMapper.listRoomAskNumMonth(schoolid, begintime, endtime, year);
+    public List<Map> listRoomAskNumMonth(RegionParam param) {
+        if(N_Utils.isEmptyInteger(param.getYear())) {
+            param.setYear(schoolMapper.getYearById(param.getSchoolid()));
+        }
+        return sAnalyzeMapper.listRoomAskNumMonth(param);
     }
 }

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolService.java

@@ -521,4 +521,9 @@ public class SchoolService {
     public List<Integer> listYear(Integer schoolid) {
         return schoolMapper.listYear(schoolid);
     }
+
+    //获取区域学年列表
+    public List<Integer> listCloudYear() {
+        return schoolMapper.listCloudYear();
+    }
 }

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

@@ -7,28 +7,52 @@
       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 c.year=s.year and pg.starttime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level} and pg.starttime between #{param.begintime} and #{param.endtime}
+        <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>
     <!--作业数量统计——预习数量-->
     <select id="getRegionPaperNumPreview" resultType="java.lang.Integer">
         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 c.year=s.year and g.createtime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level} and g.createtime between #{param.begintime} and #{param.endtime}
+        <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>
     <!--作业数量统计——背诵数量-->
     <select id="getRegionPaperNumRecite" resultType="java.lang.Integer">
        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 c.year=s.year and rg.starttime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level} and rg.starttime between #{param.begintime} and #{param.endtime}
+        <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>
     <!--作业数量统计——错题视频数量-->
     <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} and c.year=s.year and qe.createtime between #{param.begintime} and #{param.endtime}
+      where s.schoollevel=#{param.level} and qe.createtime between #{param.begintime} and #{param.endtime}
+        <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>
 
     <!--作业各类率统计-->
@@ -59,7 +83,13 @@
         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 c.year=s.year and pg.starttime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level} and pg.starttime between #{param.begintime} and #{param.endtime}
+        <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>
         group by p.schoolid,p.paperid order by p.schoolid
     </select>
     <!--作业各类率统计——背诵-->
@@ -72,7 +102,13 @@
         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 c.year=s.year  and rg.starttime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level} and rg.starttime between #{param.begintime} and #{param.endtime}
+        <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>
         group by r.schoolid,r.reciteid order by r.schoolid
     </select>
     <!--作业各类率统计——预习-->
@@ -85,7 +121,13 @@
         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 c.year=s.year and g.createtime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level} and g.createtime between #{param.begintime} and #{param.endtime}
+        <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>
         group by s.schoolid, g.guideid order by s.schoolid
     </select>
 
@@ -97,7 +139,13 @@
          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 c.year=s.year and ps.stoptime between #{param.begintime} and #{param.endtime}
+        where s.schoollevel=#{param.level} and ps.stoptime between #{param.begintime} and #{param.endtime}
+        <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>
         group by ps.schoolid order by ps.schoolid
     </select>
     <!--人均用时——预习-->
@@ -109,7 +157,13 @@
         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 c.year=s.year and gs.readtime between #{param.begintime} and #{param.endtime} and gs.readtime>0
+        where s.schoollevel=#{param.level} and gs.readtime between #{param.begintime} and #{param.endtime} 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>
         group by s.schoolid order by s.schoolid
     </select>
 

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

@@ -24,15 +24,14 @@
         left join t_classroom_paper p on p.paperid=rt.paperid
         left join t_classroom_paper_student ps on p.paperid=ps.paperid
         left join t_classroom_paper_student_scantron pss on ps.psid=pss.psid
-        where s.schoollevel=#{level} and s.schoolstate=1 and c.year=s.year and r.roomstate=2 and r.endtime is not null
-        and r.createtime between #{begintime} and #{endtime}
+        where s.schoollevel=#{param.level} and s.schoolstate=1 and r.roomstate=2 and r.endtime is not null
+        <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>
+        and r.createtime between #{param.begintime} and #{param.endtime}
         group by r.roomid
     </select>
-    <!--获取学校课堂用时人数统计-->
-    <select id="getRoom" resultType="com.xhkjedu.sapi.vo.region.RRoomVo">
-        select sum(r.endtime-r.createtime)totaltime,sum(r.classnum)classnum,sum(r.realstunum)realstunum
-        from t_classroom r left join t_class c on c.classid=r.classid
-        where r.schoolid=#{schoolid} and c.year=#{year} and r.roomstate=2 and r.endtime is not null
-        and r.createtime between #{begintime} and #{endtime}
-    </select>
 </mapper>

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

@@ -6,7 +6,13 @@
         select s.schoollevel,s.schoolname,s.shortname,s.coordinate,count(c.classid)bjnum
         ,(select count(*) from t_user u where u.schoolid=c.schoolid and u.usertype=1 and u.userstate=1)jsnum
         ,sum((select count(distinct cs.studentid) from t_class_student cs where cs.classid=c.classid))xsnum
-        from t_school s left join t_class c on c.schoolid=s.schoolid and c.classstate=1 and c.year=s.year and c.classtype=1
+        from t_school s left join t_class c on c.schoolid=s.schoolid and c.classstate=1 and c.classtype=1
+        <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.schoolstate=1 group by s.schoolid order by s.schoollevel,s.schoolid
     </select>
     <!--教师性别统计-->
@@ -31,7 +37,13 @@
         from t_class_student cs left join t_user u on cs.studentid=u.userid
         left join t_class c on cs.classid=c.classid
         left join t_school s on c.schoolid=s.schoolid
-        where s.schoolstate=1 and c.classtype=1 and c.classstate=1 and c.year=s.year
+        where s.schoolstate=1 and c.classtype=1 and c.classstate=1
+        <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>
     <!--活跃度统计-->
     <select id="listAccess" resultType="java.util.Map">

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

@@ -36,7 +36,13 @@
         ,(select cloudmap from t_cloud limit 1)cloudmap
         ,(select count(*) from t_user u where u.schoolid=c.schoolid and u.usertype=1 and u.userstate=1)jsnum
         ,sum((select count(distinct cs.studentid) from t_class_student cs where cs.classid=c.classid))xsnum
-        from t_school s left join t_class c on c.schoolid=s.schoolid and c.classstate=1 and c.year=s.year and c.classtype=1
+        from t_school s left join t_class c on c.schoolid=s.schoolid and c.classstate=1 and c.classtype=1
+        <if test="param.year!=null and param.year!=0">
+            and c.year=#{param.year}
+        </if>
+        <if test="param.year==null or param.year==0">
+            and c.year=s.year
+        </if>
         where s.schoolstate=1
         group by s.schoolid order by s.schoolid
     </select>
@@ -46,7 +52,13 @@
         ,(select count(*) from t_user u where u.schoolid=c.schoolid and u.usertype=1 and u.userstate=1)jsnum
         ,sum((select count(distinct cs.studentid) from t_class_student cs where cs.classid=c.classid))xsnum
         from t_school s right join t_class c on s.schoolid=c.schoolid
-        where s.schoolstate=1 and c.classstate=1 and c.year=s.year and c.classtype=1
+        where s.schoolstate=1 and c.classstate=1 and c.classtype=1
+        <if test="param.year!=null and param.year!=0">
+            and c.year=#{param.year}
+        </if>
+        <if test="param.year==null or param.year==0">
+            and c.year=s.year
+        </if>
         group by s.schoollevel
     </select>
 
@@ -70,10 +82,17 @@
         count(distinct case when ps.psstate!=0 then ps.psid else null end)commitnum,
         count(distinct case when ps.psstate!=0 and ps.pschecked=1 then ps.psid else null end)checknum
         from t_paper_group pg
-        right join t_school s on pg.schoolid=s.schoolid and pg.pgstate=22 and pg.starttime between #{begintime} and #{endtime}
+        right join t_school s on pg.schoolid=s.schoolid and pg.pgstate=22
+        and pg.starttime between #{param.begintime} and #{param.endtime}
         left join t_paper_student ps on ps.paperid=pg.paperid
         left join t_class c on c.classid=pg.classid
-        where s.schoolstate=1 and c.year=s.year
+        where s.schoolstate=1
+        <if test="param.year!=null and param.year!=0">
+            and c.year=#{param.year}
+        </if>
+        <if test="param.year==null or param.year==0">
+            and c.year=s.year
+        </if>
         group by s.schoolid,pg.paperid order by s.schoolid
     </select>
     <!--预习-->
@@ -81,10 +100,17 @@
         select s.schoolid,s.schoolname,s.shortname,g.guideid as rid,
         count(distinct gs.rgsid) stunum,
         count(distinct case when gs.readtime>0 then gs.rgsid else null end) commitnum
-        from t_guide g right join t_school s on g.schoolid=s.schoolid and g.createtime between #{begintime} and #{endtime}
+        from t_guide g right join t_school s on g.schoolid=s.schoolid
+        and g.createtime between #{param.begintime} and #{param.endtime}
         left join t_guide_group_student gs on gs.guideid=g.guideid
         left join t_class c on c.classid=gs.classid
-        where s.schoolstate=1 and c.year=s.year
+        where s.schoolstate=1
+        <if test="param.year!=null and param.year!=0">
+            and c.year=#{param.year}
+        </if>
+        <if test="param.year==null or param.year==0">
+            and c.year=s.year
+        </if>
         group by s.schoolid,g.guideid order by g.schoolid
     </select>
 
@@ -93,18 +119,32 @@
         select s.schoolid,s.schoolname,s.shortname,rg.reciteid as wid,
         count(distinct rs.rsid) stunum,
         count(distinct case when rs.rsstate!=0 then rs.rsid else null end) commitnum
-        from t_recite_group rg right join t_school s on rg.schoolid=s.schoolid and rg.starttime between #{begintime} and #{endtime}
+        from t_recite_group rg right join t_school s on rg.schoolid=s.schoolid
+        and rg.starttime between #{param.begintime} and #{param.endtime}
         left join t_recite_student rs on rs.reciteid=rg.reciteid and rs.classid=rg.classid
         left join t_class c on c.classid=rg.classid
-        where s.schoolstate=1 and c.year=s.year
+        where s.schoolstate=1
+        <if test="param.year!=null and param.year!=0">
+            and c.year=#{param.year}
+        </if>
+        <if test="param.year==null or param.year==0">
+            and c.year=s.year
+        </if>
         group by s.schoolid,rg.reciteid order by s.schoolid
     </select>
     <!--课堂出勤率-->
     <select id="listRoomCommitMonth" resultType="java.util.Map">
         select s.schoolid,s.schoolname,s.shortname,ifnull(SUM(c.classnum),0) stunum,ifnull(SUM(c.realstunum),0) commitnum
         from t_classroom c left join t_class c2 on c.classid=c2.classid
-        right join t_school s on c.schoolid=s.schoolid and c.roomstate=2 and c.createtime between #{begintime} and #{endtime}
-        where s.schoolstate=1 and c2.year=s.year
+        right join t_school s on c.schoolid=s.schoolid and c.roomstate=2
+        and c.createtime between #{param.begintime} and #{param.endtime}
+        where s.schoolstate=1
+        <if test="param.year!=null and param.year!=0">
+            and c2.year=#{param.year}
+        </if>
+        <if test="param.year==null or param.year==0">
+            and c2.year=s.year
+        </if>
         group by s.schoolid order by s.schoolid
     </select>
 
@@ -112,8 +152,15 @@
     <select id="listPapernumMonth" resultType="com.xhkjedu.sapi.vo.region.WorkVo">
         select s.schoolid,s.schoolname,s.shortname,count(distinct pg.paperid) num
         from t_paper_group pg left join t_class c on c.classid=pg.classid
-        right join t_school s on pg.schoolid=s.schoolid and pg.pgstate=22 and pg.createtime between #{begintime} and #{endtime}
-        where s.schoolstate=1 and c.year=s.year
+        right join t_school s on pg.schoolid=s.schoolid and pg.pgstate=22
+        and pg.createtime between #{param.begintime} and #{param.endtime}
+        where s.schoolstate=1
+        <if test="param.year!=null and param.year!=0">
+            and c.year=#{param.year}
+        </if>
+        <if test="param.year==null or param.year==0">
+            and c.year=s.year
+        </if>
         group by s.schoolid order by s.schoolid
 
     </select>
@@ -121,9 +168,16 @@
     <!--课堂使用情况统计——使用次数-->
     <select id="listRoomNumMonth" resultType="com.xhkjedu.sapi.vo.region.WorkVo">
         select s.schoolid,s.schoolname,s.shortname,count(c.roomid) num from t_classroom c
-        right join t_school s on c.schoolid=s.schoolid and c.createtime between #{begintime} and #{endtime}
+        right join t_school s on c.schoolid=s.schoolid
+        and c.createtime between #{param.begintime} and #{param.endtime}
         left join t_class c2 on c.classid=c2.classid
-        where s.schoolstate=1 and c2.year=s.year
+        where s.schoolstate=1
+        <if test="param.year!=null and param.year!=0">
+            and c2.year=#{param.year}
+        </if>
+        <if test="param.year==null or param.year==0">
+            and c2.year=s.year
+        </if>
         group by s.schoolid order by s.schoolid
     </select>
     <resultMap id="roomAsk" type="com.xhkjedu.sapi.vo.region.WorkVo">
@@ -137,24 +191,23 @@
     </resultMap>
 
     <!--课堂使用情况统计——课堂互动-->
-    <select id="listRoomAskNumMonth" resultMap="roomAsk">
-      select s.schoolid,s.schoolname,s.shortname,ca.asktype,count(ca.asktid) asknum from t_classroom_askteacher ca
-        right join t_school s on ca.schoolid=s.schoolid
-        left join t_classroom c on ca.roomid=c.roomid and c.createtime between #{begintime} and #{endtime}
-        left join t_class c2 on c.classid=c2.classid
-        where s.schoolstate=1 and c2.year=s.year
-        group by s.schoolid,ca.asktype order by s.schoolid
-    </select>
     <select id="listRoomAskNumMonth2" resultType="java.util.Map">
         select s.schoolname,s.shortname,count(distinct c.roomid)num
         ,sum(case when ca.asktype between 30 and 33 then 1 else 0 end)twnum
         ,sum(case when ca.asktype =40 then 1 else 0 end)tcnum
         ,sum(case when ca.asktype =21 then 1 else 0 end)dmnum
         ,sum(case when ca.asktype =20 then 1 else 0 end)qdnum
-        from t_classroom c right join t_school s on c.schoolid=s.schoolid and c.createtime between #{begintime} and #{endtime}
+        from t_classroom c right join t_school s on c.schoolid=s.schoolid
+        and c.createtime between #{param.begintime} and #{param.endtime}
         left join t_classroom_askteacher ca on ca.roomid=c.roomid
         left join t_class c2 on c.classid=c2.classid
-        where s.schoolstate=1 and c2.year=s.year
+        where s.schoolstate=1
+        <if test="param.year!=null and param.year!=0">
+            and c2.year=#{param.year}
+        </if>
+        <if test="param.year==null or param.year==0">
+            and c2.year=s.year
+        </if>
         group by s.schoolid order by s.schoolid
     </select>
 </mapper>

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

@@ -40,22 +40,14 @@
         and ts.schoolid=#{schoolid}
         group by r.subjectid order by s.subjectorder
     </select>
-    <!--获取学段班级、教师、学生总量-->
-    <select id="listClassTeacherStudentNum" resultType="java.util.Map">
-        select count(c.classid)bjnum
-        ,(select count(*) from t_user u where u.schoolid=c.schoolid and u.usertype=1 and u.userstate=1)jsnum
-        ,sum((select count(distinct cs.studentid) from t_class_student cs where cs.classid=c.classid))xsnum
-        from t_school s right join t_class c on s.schoolid=c.schoolid
-        where s.schoolid=#{schoolid} and c.classstate=1 and c.year=s.year and c.classtype=1
-    </select>
+    <!--获取班级、教师、学生总量-->
     <select id="listClassTeacherStudent" resultType="java.util.Map">
         select c.classid,c.classname,c.gradeid,c.classorder,tu.userid teacherid,cs.studentid,ifnull(u.usersex,0)usersex
-        from t_school s right join t_class c on s.schoolid=c.schoolid
-        left join t_class_teacher ct on c.classid=ct.classid
+        from t_class c left join t_class_teacher ct on c.classid=ct.classid
         left join t_user tu on ct.teacherid=tu.userid and tu.usertype=1 and tu.userstate=1
         left join t_class_student cs on c.classid=cs.classid
         left join t_user u on cs.studentid=u.userid
-        where s.schoolid=#{schoolid} and c.classstate=1 and c.year=s.year and c.classtype=1
+        where c.schoolid=#{param.schoolid} and c.classstate=1 and c.year=#{param.year} and c.classtype=1
     </select>
     <!--访问量统计-->
     <select id="listAccess" resultType="com.xhkjedu.sapi.vo.region.AccessVo">
@@ -80,7 +72,8 @@
         left join t_subject s on p.subjectid=s.subjectid
         left join t_class c on pg.classid=c.classid
         left join t_paper_student ps on ps.paperid=pg.paperid
-        where c.year=#{year} and p.schoolid=#{schoolid} and pg.pgstate=22 and pg.starttime between #{begintime} and #{endtime}
+        where c.year=#{param.year} and p.schoolid=#{param.schoolid} and pg.pgstate=22
+        and pg.starttime between #{param.begintime} and #{param.endtime}
         group by c.gradeid,p.subjectid
     </select>
     <!--预习-->
@@ -90,7 +83,8 @@
         from t_guide g left join t_subject s on g.subjectid=s.subjectid
         left join t_guide_group_student gs on gs.guideid=g.guideid
         left join t_class c on gs.classid=c.classid
-        where c.year=#{year} and g.schoolid=#{schoolid} and g.createtime between #{begintime} and #{endtime}
+        where c.year=#{param.year} and g.schoolid=#{param.schoolid}
+        and g.createtime between #{param.begintime} and #{param.endtime}
         group by c.gradeid,g.subjectid
     </select>
 
@@ -98,7 +92,8 @@
     <select id="listRoomNumMonth" resultType="com.xhkjedu.sapi.vo.region.SWorkVo">
         select s.classid,s.classname,s.gradeid,count(c.roomid) num from t_classroom c
         left join t_class s on c.classid=s.classid
-        where c.schoolid=#{schoolid} and s.year=#{year} and c.createtime between #{begintime} and #{endtime}
+        where c.schoolid=#{param.schoolid} and s.year=#{param.year}
+        and c.createtime between #{param.begintime} and #{param.endtime}
         group by c.classid order by s.gradeid,s.classorder
     </select>
 
@@ -109,9 +104,10 @@
         ,sum(case when ca.asktype =40 then 1 else 0 end)tcnum
         ,sum(case when ca.asktype =21 then 1 else 0 end)dmnum
         ,sum(case when ca.asktype =20 then 1 else 0 end)qdnum
-        from t_classroom c left join t_class s on c.classid=s.classid and c.createtime between #{begintime} and #{endtime}
+        from t_classroom c left join t_class s on c.classid=s.classid
         left join t_classroom_askteacher ca on ca.roomid=c.roomid
-        where c.schoolid=#{schoolid} and s.year=#{year} and c.createtime between #{begintime} and #{endtime}
+        where c.schoolid=#{param.schoolid} and s.year=#{param.year}
+        and c.createtime between #{param.begintime} and #{param.endtime}
         group by c.classid order by s.gradeid,s.classorder
     </select>
 </mapper>

sapi/src/main/resources/mapper/system/SchoolMapper.xml

@@ -108,4 +108,8 @@
     <select id="listYear" resultType="java.lang.Integer">
         select c.year from t_class c where c.schoolid=#{schoolid} and c.classtype=1 and c.classstate=1 group by c.year
     </select>
+    <!--获取区域学年列表-->
+    <select id="listCloudYear" resultType="java.lang.Integer">
+        select c.year from t_class c where c.classtype=1 and c.classstate=1 group by c.year
+    </select>
 </mapper>