From 4e66263772a01f8fe0c511aad972ec71b7da8fa3 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Sat, 11 Feb 2023 23:43:35 +0800
Subject: [PATCH] 1
---
.../com/ibeetl/jlw/service/CourseInfoService.java | 11 ++++++-----
.../jlw/service/ResourcesApplicationService.java | 9 +++++++--
.../jlw/service/StatisticalAnalysisService.java | 12 +++++++++---
3 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java
index b240aac9..9be56124 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java
@@ -900,16 +900,17 @@ public class CourseInfoService extends CoreBaseService<CourseInfo>{
return titleLvl;
}
- public List<CourseInfo> getCourseInfoByStimeAndEtime(Date stime, Date etime, Long universitiesCollegesId) {
+ public long getCourseInfoByStimeAndEtime(Date stime, Date etime, Long orgId) {
LambdaQuery<CourseInfo> lambdaQuery = courseInfoDao.createLambdaQuery();
if (stime != null && etime != null) {
lambdaQuery.andBetween(CourseInfo::getAddTime, stime, etime)
.andEq(CourseInfo::getCourseInfoStatus, 1);
}
-// if (universitiesCollegesId != null) {
-// lambdaQuery.andEq(CourseInfo::get)
-// }
- return lambdaQuery.andEq(CourseInfo::getCourseInfoStatus, 1).select();
+ if (orgId == null) {
+ return 0L;
+ }
+ lambdaQuery.andEq(CourseInfo::getOrgId, orgId);
+ return lambdaQuery.andEq(CourseInfo::getCourseInfoStatus, 1).andEq(CourseInfo::getCourseInfoType, 1).count();
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java
index 09823a90..ff635294 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java
@@ -295,12 +295,17 @@ public class ResourcesApplicationService extends CoreBaseService<ResourcesApplic
return sqlManager.select(SqlId.of("jlw.resourcesApplication.getResourcesApplicationValues"),ResourcesApplication.class,paras);
}
- public List<ResourcesApplication> getApplicationByStimeAndEtime(Date stime, Date etime) {
+ public long getApplicationByStimeAndEtime(Date stime, Date etime, Long orgId) {
LambdaQuery<ResourcesApplication> lambdaQuery = resourcesApplicationDao.createLambdaQuery();
+
+ if (orgId == null) {
+ return 0L;
+ }
+ lambdaQuery.andEq(ResourcesApplication::getOrgId, orgId);
// if (stime != null && etime != null) {
// return lambdaQuery.andBetween(ResourcesApplication::get, stime, etime).andEq(ResourcesApplication::getTeacherStatus, 1).select();
// }
- return lambdaQuery.select();
+ return lambdaQuery.count();
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java
index 39d4fbbb..f5f1a150 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java
@@ -21,6 +21,8 @@ import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import static java.util.Optional.ofNullable;
+
/**
* 统计分析service
* @Version 0.0.1
@@ -263,6 +265,7 @@ public class StatisticalAnalysisService {
public Map<String, Object> adminIndexDetail(Date stime, Date etime, UniversitiesColleges universitiesColleges) {
Long universitiesCollegesId = (universitiesColleges == null ? null : universitiesColleges.getUniversitiesCollegesId());
+ Long uniOrgId = (universitiesColleges == null ? null : universitiesColleges.getOrgId());
List<Student> studentList = studentService.getStudentByStimeAndEtime(stime, etime, universitiesCollegesId);
Map<String, Object> data = new HashMap<>();
//注册学生数
@@ -284,11 +287,11 @@ public class StatisticalAnalysisService {
//登录人次
data.put("studentPersonTime", loginCount);
//上线课程数
- Long courseInfoCount = courseInfoService.getCourseInfoByStimeAndEtime(stime, etime);
+ Long courseInfoCount = courseInfoService.getCourseInfoByStimeAndEtime(stime, etime, uniOrgId);
data.put("courseNumber", courseInfoCount);
//上线应用数
- List<ResourcesApplication> resourcesApplicationList = resourcesApplicationService.getApplicationByStimeAndEtime(stime, etime);
- data.put("applicationNumber", resourcesApplicationList.size());
+ Long resourcesApplicationCount = resourcesApplicationService.getApplicationByStimeAndEtime(stime, etime, uniOrgId);
+ data.put("applicationNumber", resourcesApplicationCount);
//批改作业数
data.put("homeWorkNumber", studentList.size());
//课程学习
@@ -299,6 +302,7 @@ public class StatisticalAnalysisService {
data.put("universitiesCollegesAuthCode", universitiesColleges != null ? universitiesColleges.getUniversitiesCollegesAuthCode() : "暂无动态码");
//注册用户数
int size = coreUserService.createLambdaQuery().andEq(CoreUser::getDelFlag, DelFlagEnum.NORMAL.getValue())
+ .andEq(CoreUser::getOrgId, ofNullable(uniOrgId))
.andNotEq(CoreUser::getId, 1).select().size();
data.put("userNumber", size);
//案例数量
@@ -314,11 +318,13 @@ public class StatisticalAnalysisService {
//题库数量
ResourcesQuestionQuery paras1 = new ResourcesQuestionQuery();
paras1.setQuestionStatus(1);
+ paras1.setOrgId(uniOrgId);
List<ResourcesQuestion> questionList = resourcesQuestionService.getValues(paras1);
data.put("questionNumber", questionList.size());
//院校数量
UniversitiesCollegesQuery paras = new UniversitiesCollegesQuery();
paras.setUniversitiesCollegesStatus(1);
+ paras.setOrgId(uniOrgId);
List<UniversitiesColleges> schoolList = universitiesCollegesService.getValues(paras);
data.put("schoolNumber", schoolList.size());
return data;