首页数据

web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java

@@ -772,7 +772,7 @@ public class CourseInfoService extends CoreBaseService<CourseInfo>{
         return titleLvl;
     }
 
-    public List<CourseInfo> getCourseInfoByStimeAndEtime(Date stime, Date etime, String universitiesCollegesId) {
+    public List<CourseInfo> getCourseInfoByStimeAndEtime(Date stime, Date etime, Long universitiesCollegesId) {
         LambdaQuery<CourseInfo> lambdaQuery = courseInfoDao.createLambdaQuery();
         if (stime != null && etime != null) {
             lambdaQuery.andBetween(CourseInfo::getAddTime, stime, etime)

web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java

@@ -137,7 +137,7 @@ public class StatisticalAnalysisService {
         return data;
     }
 
-    public Map<String, Object> adminIndexDetail(Date stime, Date etime, String universitiesCollegesId) {
+    public Map<String, Object> adminIndexDetail(Date stime, Date etime, Long universitiesCollegesId) {
         List<Student> studentList = studentService.getStudentByStimeAndEtime(stime, etime, universitiesCollegesId);
         Map<String, Object> data = new HashMap<>();
         //注册学生数

web/src/main/java/com/ibeetl/jlw/service/StudentService.java

@@ -49,6 +49,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static cn.jlw.token.TokenService.updateByIds;
 import static com.ibeetl.jlw.web.IpAddressController.ipAddressMap;
@@ -864,15 +865,20 @@ public class StudentService extends CoreBaseService<Student>{
         return ret;
     }
 
-    public List<Student> getStudentByStimeAndEtime(Date stime, Date etime, String universitiesCollegesId) {
+    public List<Student> getStudentByStimeAndEtime(Date stime, Date etime, Long universitiesCollegesId) {
         LambdaQuery<Student> lambdaQuery = studentDao.createLambdaQuery();
         if (stime != null && etime != null) {
             lambdaQuery.andBetween(Student::getAddTime, stime, etime)
                     .andEq(Student::getStudentStatus, 1);
         }
-//        if (universitiesCollegesId != null) {
-//            lambdaQuery.andEq(Student::getSchoolClass, universitiesCollegesId);
-//        }
+
+        if (universitiesCollegesId != null) {
+            SchoolClassQuery schoolClassQuery = new SchoolClassQuery();
+            schoolClassQuery.setUniversitiesCollegesId(universitiesCollegesId);
+            List<SchoolClass> classList = schoolClassDao.getValuesByQuery(schoolClassQuery);
+            List<Long> classIds = classList.stream().map(SchoolClass::getClassId).collect(Collectors.toList());
+            lambdaQuery.andIn(Student::getClassId, classIds);
+        }
         return lambdaQuery.andEq(Student::getStudentStatus, 1).select();
 
     }

web/src/main/java/com/ibeetl/jlw/service/TeacherService.java

@@ -738,7 +738,7 @@ public class TeacherService extends CoreBaseService<Teacher> {
                 .select();
     }
 
-    public List<Teacher> getTeacherByStimeAndEtime(Date stime, Date etime, String universitiesCollegesId) {
+    public List<Teacher> getTeacherByStimeAndEtime(Date stime, Date etime, Long universitiesCollegesId) {
         LambdaQuery<Teacher> lambdaQuery = teacherDao.createLambdaQuery();
         if (stime != null && etime != null) {
             lambdaQuery.andBetween(Teacher::getAddTime, stime, etime).andEq(Teacher::getTeacherStatus, 1);

web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java

@@ -58,7 +58,7 @@ public class StatisticalAnalysisController {
     @RequestMapping("/adminIndexDetail.do")
     public JsonResult<Object> adminIndexDetail(@RequestParam(value = "stime", required = false) Date stime,
                                                @RequestParam(value = "etime", required = false) Date etime,
-                                               @RequestParam(value = "universitiesCollegesId", required = false) String universitiesCollegesId
+                                               @RequestParam(value = "universitiesCollegesId", required = false) Long universitiesCollegesId
 
     ) {
         Map<String, Object> detail = statisticalAnalysisService.adminIndexDetail(stime, etime, universitiesCollegesId);