tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、swagger接口文档

Browse Source
beetlsql3-dev
陈沅 1 year ago
parent 91f432de9a
commit 7c7e32efc2
7 changed files with 227 additions and 211 deletions
Show Stats Download Patch File Download Diff File

1
web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java
Unescape Escape View File

@ -125,4 +125,5 @@ public interface StudentDao extends BaseMapper<Student>{
List<Student> getStudentByStudentNoAndOrgId(String studentNo,Long orgId); List<Student> getStudentByStudentNoAndOrgId(String studentNo,Long orgId);
List<Student>getValuesByOrgId(Long orgId);
} }

393
web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java
Unescape Escape View File

@ -462,27 +462,30 @@ public class StatisticalAnalysisService {
public Map<String, Object> adminIndexDetail(Date stime, Date etime, UniversitiesColleges universitiesColleges, CoreUser coreUser) { public Map<String, Object> adminIndexDetail(Date stime, Date etime, UniversitiesColleges universitiesColleges, CoreUser coreUser) {
// Date startTime = DateUtil.beginOfDay(new Date()); // Date startTime = DateUtil.beginOfDay(new Date());
// Date endTime = DateUtil.endOfDay(new Date()); // Date endTime = DateUtil.endOfDay(new Date());
Date startTime = null; //--------------------------------------------------
Date endTime = null; // Date startTime = null;
if (!Objects.isNull(stime)) { // Date endTime = null;
startTime = DateUtil.beginOfDay(stime); // if (!Objects.isNull(stime)) {
} // startTime = DateUtil.beginOfDay(stime);
// }
if (!Objects.isNull(stime)) { //
endTime = DateUtil.endOfDay(etime); // if (!Objects.isNull(stime)) {
} // endTime = DateUtil.endOfDay(etime);
// }
Long orgId = coreUser.getOrgId(); //
Long universitiesCollegesId = (universitiesColleges == null ? orgId : universitiesColleges.getUniversitiesCollegesId()); // Long orgId = coreUser.getOrgId();
Long uniOrgId = (universitiesColleges == null ? orgId : universitiesColleges.getOrgId()); // Long universitiesCollegesId = (universitiesColleges == null ? orgId : universitiesColleges.getUniversitiesCollegesId());
// Long uniOrgId = (universitiesColleges == null ? orgId : universitiesColleges.getOrgId());
List<Student> studentList = studentService.getStudentByStimeAndEtime(startTime, endTime, uniOrgId); //
// List<Student> studentList = studentService.getStudentByStimeAndEtime(startTime, endTime, uniOrgId);
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
//注册学生数 // //注册学生数
data.put("studentNumber", studentList.size()); // data.put("studentNumber", studentList.size());
//注册老师数 // //注册老师数
List<Teacher> teachers = teacherService.getTeacherByStimeAndEtime(startTime, endTime, uniOrgId); // List<Teacher> teachers = teacherService.getTeacherByStimeAndEtime(startTime, endTime, uniOrgId);
data.put("teacherNumber", teachers.size()); // data.put("teacherNumber", teachers.size());
//--------------------------------------------
// LambdaQuery<CoreUser> lambdaQuery = coreUserDao.createLambdaQuery(); // LambdaQuery<CoreUser> lambdaQuery = coreUserDao.createLambdaQuery();
// if (uniOrgId != null && uniOrgId != 1) { // if (uniOrgId != null && uniOrgId != 1) {
// lambdaQuery.andEq(CoreUser::getOrgId, uniOrgId); // lambdaQuery.andEq(CoreUser::getOrgId, uniOrgId);
@ -511,187 +514,187 @@ public class StatisticalAnalysisService {
// loginDistinctCountQuery.andIsNotNull(CoreUser::getLoginCount); // loginDistinctCountQuery.andIsNotNull(CoreUser::getLoginCount);
// long loginDistinctCount = loginDistinctCountQuery.count(); // long loginDistinctCount = loginDistinctCountQuery.count();
StudentLoginLogQuery condition = new StudentLoginLogQuery(); // StudentLoginLogQuery condition = new StudentLoginLogQuery();
if (ObjectUtil.isNotEmpty(startTime)){ // if (ObjectUtil.isNotEmpty(startTime)){
condition.setLoginStartTime(startTime); // condition.setLoginStartTime(startTime);
} // }
if (ObjectUtil.isNotEmpty(endTime)){ // if (ObjectUtil.isNotEmpty(endTime)){
condition.setLoginEndTime(endTime); // condition.setLoginEndTime(endTime);
} // }
condition.setLoginPath(ResponseControllerAdvice.LOGIN_URL); // condition.setLoginPath(ResponseControllerAdvice.LOGIN_URL);
condition.setLogoutPath(KeyExpiredListener.TOKEN_EXPIRED_MESSAGE); // condition.setLogoutPath(KeyExpiredListener.TOKEN_EXPIRED_MESSAGE);
UniversitiesColleges uniAdmin = getUniAdmin(); // UniversitiesColleges uniAdmin = getUniAdmin();
if (null != uniAdmin) { // if (null != uniAdmin) {
condition.getPageQuery().setPara("universitiesCollegesId", uniAdmin.getUniversitiesCollegesId()); // condition.getPageQuery().setPara("universitiesCollegesId", uniAdmin.getUniversitiesCollegesId());
} // }
//
//登录人数 // //登录人数
PageQuery<StudentLogAnalysisVO> studentLogAnalysisVOPageQuery = studentService.queryStatisticalStatementNumberPeopleByCondition(condition.getPageQuery()); // PageQuery<StudentLogAnalysisVO> studentLogAnalysisVOPageQuery = studentService.queryStatisticalStatementNumberPeopleByCondition(condition.getPageQuery());
long loginDistinctCount = studentLogAnalysisVOPageQuery.getList().stream().mapToLong(i -> Integer.parseInt(i.getLoginCount())).sum(); // long loginDistinctCount = studentLogAnalysisVOPageQuery.getList().stream().mapToLong(i -> Integer.parseInt(i.getLoginCount())).sum();
data.put("loginNumber", loginDistinctCount); // data.put("loginNumber", loginDistinctCount);
//
// 获取登录次数 // // 获取登录次数
PageQuery<StudentLoginLogVO> studentLoginLogVOPageQuery = studentService.queryUserLoginLogByCondition(condition.getPageQuery()); // PageQuery<StudentLoginLogVO> studentLoginLogVOPageQuery = studentService.queryUserLoginLogByCondition(condition.getPageQuery());
Long loginCount = studentLoginLogVOPageQuery.getTotalRow(); // Long loginCount = studentLoginLogVOPageQuery.getTotalRow();
// Long loginCount = coreUserDao.getSumLoginCount(stime, etime, orgId == 1 ? null : orgId); //// Long loginCount = coreUserDao.getSumLoginCount(stime, etime, orgId == 1 ? null : orgId);
//登录人次 // //登录人次
data.put("studentPersonTime", loginCount); // data.put("studentPersonTime", loginCount);
//上线课程数 // //上线课程数
// Long courseInfoCount = courseInfoService.getCourseInfoByStimeAndEtime(stime, etime, uniOrgId); //// Long courseInfoCount = courseInfoService.getCourseInfoByStimeAndEtime(stime, etime, uniOrgId);
//
// List<CourseInfo> theoryCourseList = universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(orgId).getTheoryCourseList(); //// List<CourseInfo> theoryCourseList = universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(orgId).getTheoryCourseList();
TeacherOpenCourseQuery teacherOpenCourseQuery = new TeacherOpenCourseQuery(); // TeacherOpenCourseQuery teacherOpenCourseQuery = new TeacherOpenCourseQuery();
if (ObjectUtil.isNotEmpty(startTime)){ // if (ObjectUtil.isNotEmpty(startTime)){
teacherOpenCourseQuery.setFilterStartTime(startTime); // teacherOpenCourseQuery.setFilterStartTime(startTime);
} // }
if (ObjectUtil.isNotEmpty(endTime)){ // if (ObjectUtil.isNotEmpty(endTime)){
teacherOpenCourseQuery.setFilterEndTime(endTime); // teacherOpenCourseQuery.setFilterEndTime(endTime);
} // }
List<TeacherOpenCourse> teacherOpenCourseMergeCourseInfo = teacherOpenCourseService.getTeacherOpenCourseMergeCourseInfo(teacherOpenCourseQuery, coreUser); // List<TeacherOpenCourse> teacherOpenCourseMergeCourseInfo = teacherOpenCourseService.getTeacherOpenCourseMergeCourseInfo(teacherOpenCourseQuery, coreUser);
data.put("courseNumber", teacherOpenCourseMergeCourseInfo.size()); // data.put("courseNumber", teacherOpenCourseMergeCourseInfo.size());
//
Long resourcesApplicationCount = 0L; // Long resourcesApplicationCount = 0L;
//
// 如果是学校管理员身份 // // 如果是学校管理员身份
if (coreUser.isUniAdmin()) { // if (coreUser.isUniAdmin()) {
resourcesApplicationCount = universitiesCollegesJurisdictionExperimentalSystemDao.createLambdaQuery() // resourcesApplicationCount = universitiesCollegesJurisdictionExperimentalSystemDao.createLambdaQuery()
.andEq(UniversitiesCollegesJurisdictionExperimentalSystem::getUniversitiesCollegesId, universitiesCollegesId) // .andEq(UniversitiesCollegesJurisdictionExperimentalSystem::getUniversitiesCollegesId, universitiesCollegesId)
.andNotEq(UniversitiesCollegesJurisdictionExperimentalSystem::getUseType, 0) // .andNotEq(UniversitiesCollegesJurisdictionExperimentalSystem::getUseType, 0)
.andBetween(UniversitiesCollegesJurisdictionExperimentalSystem::getAddTime, startTime, endTime) // .andBetween(UniversitiesCollegesJurisdictionExperimentalSystem::getAddTime, startTime, endTime)
.count();
}
// 超管
else {
//上线应用数
resourcesApplicationCount = resourcesApplicationService.getApplicationByStimeAndEtime(startTime, endTime, uniOrgId);
}
data.put("applicationNumber", resourcesApplicationCount);
TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery = new TeacherOpenCourseQuestionSettingQuery();
List<TeacherOpenCourse> select11 = teacherOpenCourseService.createLambdaQuery().andEq(TeacherOpenCourse::getOrgId, uniOrgId)
.andEq(TeacherOpenCourse::getTeacherOpenCourseStatus, 1).select();
Set<Long> collect11 = select11.stream().map(TeacherOpenCourse::getTeacherOpenCourseId).collect(Collectors.toSet());
if (orgId != null && orgId != 1) {
teacherOpenCourseQuestionSettingQuery.setOrgId(uniOrgId);
}
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
if (ObjectUtil.isNotEmpty(startTime)){
teacherOpenCourseQuestionSettingQuery.setStartTime(startTime);
}
if (ObjectUtil.isNotEmpty(endTime)){
teacherOpenCourseQuestionSettingQuery.setEndTime(endTime);
}
List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery);
// 学生做题：读取【文档存档】中所有课程的【章节】、【课程实操】、【作业—题库作业】、【考试】，这几个模块的任务数量
// List<Long> questionSettingIdList = courseQuestionSettings.stream().map(item -> item.getTeacherOpenCourseQuestionSettingId()).collect(Collectors.toList());
// long allQuestionSettingNumber = resourcesQuestionSnapshotDao.createLambdaQuery().andIn(ResourcesQuestionSnapshot::getTeacherOpenCourseQuestionSettingId, questionSettingIdList)
// .count(); // .count();
// }
long homeWorkNumber = courseQuestionSettings.stream().filter(item -> !HOMEWORK_FILE.equals(item.getTeacherOpenCourseQuestionSettingType())).count(); // // 超管
// else {
//批改作业数 // //上线应用数
data.put("homeWorkNumber", homeWorkNumber); // resourcesApplicationCount = resourcesApplicationService.getApplicationByStimeAndEtime(startTime, endTime, uniOrgId);
//课件学习 // }
TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery(); // data.put("applicationNumber", resourcesApplicationCount);
tasksQuery.setTeacherOpenCourseIdPlural(CollectionUtil.join(collect11, ",")); //
if (ObjectUtil.isNotEmpty(startTime)){ // TeacherOpenCourseQuestionSettingQuery teacherOpenCourseQuestionSettingQuery = new TeacherOpenCourseQuestionSettingQuery();
tasksQuery.setStartTime(startTime); // List<TeacherOpenCourse> select11 = teacherOpenCourseService.createLambdaQuery().andEq(TeacherOpenCourse::getOrgId, uniOrgId)
} // .andEq(TeacherOpenCourse::getTeacherOpenCourseStatus, 1).select();
if (ObjectUtil.isNotEmpty(endTime)){ // Set<Long> collect11 = select11.stream().map(TeacherOpenCourse::getTeacherOpenCourseId).collect(Collectors.toSet());
tasksQuery.setEndTime(endTime); // if (orgId != null && orgId != 1) {
} // teacherOpenCourseQuestionSettingQuery.setOrgId(uniOrgId);
if (orgId != 1) { // }
tasksQuery.setOrgId(orgId); // teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH);
} // teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1);
List<TeacherOpenCourseHandsOnSimulationTasks> teacherOpenCourseHandsOnSimulationTasks = teacherOpenCourseHandsOnSimulationTasksService.getValuesByQueryNotWithPermission(tasksQuery); // if (ObjectUtil.isNotEmpty(startTime)){
long count = teacherOpenCourseHandsOnSimulationTasks.stream().filter(v -> "1".equals(v.getTaskType()) || "2".equals(v.getTaskType())).count(); // teacherOpenCourseQuestionSettingQuery.setStartTime(startTime);
data.put("studyNumber", count); // }
// if (ObjectUtil.isNotEmpty(endTime)){
// teacherOpenCourseQuestionSettingQuery.setEndTime(endTime);
// }
// List<TeacherOpenCourseQuestionSettingPure> courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery);
//
// // 学生做题：读取【文档存档】中所有课程的【章节】、【课程实操】、【作业—题库作业】、【考试】，这几个模块的任务数量
//// List<Long> questionSettingIdList = courseQuestionSettings.stream().map(item -> item.getTeacherOpenCourseQuestionSettingId()).collect(Collectors.toList());
//// long allQuestionSettingNumber = resourcesQuestionSnapshotDao.createLambdaQuery().andIn(ResourcesQuestionSnapshot::getTeacherOpenCourseQuestionSettingId, questionSettingIdList)
//// .count();
//
// long homeWorkNumber = courseQuestionSettings.stream().filter(item -> !HOMEWORK_FILE.equals(item.getTeacherOpenCourseQuestionSettingType())).count();
//
// //批改作业数
// data.put("homeWorkNumber", homeWorkNumber);
// //课件学习
// TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery();
// tasksQuery.setTeacherOpenCourseIdPlural(CollectionUtil.join(collect11, ","));
// if (ObjectUtil.isNotEmpty(startTime)){
// tasksQuery.setStartTime(startTime);
// }
// if (ObjectUtil.isNotEmpty(endTime)){
// tasksQuery.setEndTime(endTime);
// }
// if (orgId != 1) {
// tasksQuery.setOrgId(orgId);
// }
// List<TeacherOpenCourseHandsOnSimulationTasks> teacherOpenCourseHandsOnSimulationTasks = teacherOpenCourseHandsOnSimulationTasksService.getValuesByQueryNotWithPermission(tasksQuery);
// long count = teacherOpenCourseHandsOnSimulationTasks.stream().filter(v -> "1".equals(v.getTaskType()) || "2".equals(v.getTaskType())).count();
// data.put("studyNumber", count);
//学生做题 课程实操。学生做题：读取【文档存档】中所有课程的【章节】、【课程实操】、【作业—题库作业】、【考试】，这几个模块的任务数量 （题目配置数量，非题目数量） //学生做题 课程实操。学生做题：读取【文档存档】中所有课程的【章节】、【课程实操】、【作业—题库作业】、【考试】，这几个模块的任务数量 （题目配置数量，非题目数量）
data.put("exerciseNumber", teacherOpenCourseHandsOnSimulationTasks.size() + courseQuestionSettings.size() + homeWorkNumber); // data.put("exerciseNumber", teacherOpenCourseHandsOnSimulationTasks.size() + courseQuestionSettings.size() + homeWorkNumber);
//学校动态码 //学校动态码
data.put("universitiesCollegesAuthCode", universitiesColleges != null ? universitiesColleges.getUniversitiesCollegesAuthCode() : "暂无动态码"); data.put("universitiesCollegesAuthCode", universitiesColleges != null ? universitiesColleges.getUniversitiesCollegesAuthCode() : "暂无动态码");
//注册用户数 //注册用户数
LambdaQuery<CoreUser> lambdaQuery2 = coreUserDao.createLambdaQuery(); // LambdaQuery<CoreUser> lambdaQuery2 = coreUserDao.createLambdaQuery();
if (uniOrgId != null && uniOrgId != 1) { // if (uniOrgId != null && uniOrgId != 1) {
lambdaQuery2.andEq(CoreUser::getOrgId, uniOrgId); // lambdaQuery2.andEq(CoreUser::getOrgId, uniOrgId);
} // }
if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){ // if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){
lambdaQuery2.andBetween(CoreUser::getCreateTime, startTime, endTime); // lambdaQuery2.andBetween(CoreUser::getCreateTime, startTime, endTime);
} // }
int size = lambdaQuery2.andEq(CoreUser::getDelFlag, DelFlagEnum.NORMAL.getValue()) // int size = lambdaQuery2.andEq(CoreUser::getDelFlag, DelFlagEnum.NORMAL.getValue())
.andNotEq(CoreUser::getId, 1) // .andNotEq(CoreUser::getId, 1)
.select().size(); // .select().size();
data.put("userNumber", size); // data.put("userNumber", size);
//案例数量 // //案例数量
LambdaQuery<HandsOn> lambdaQuery3 = handsOnService.createLambdaQuery(); // LambdaQuery<HandsOn> lambdaQuery3 = handsOnService.createLambdaQuery();
if (uniOrgId != null && uniOrgId != 1) { // if (uniOrgId != null && uniOrgId != 1) {
lambdaQuery3.andEq(HandsOn::getOrgId, uniOrgId); // lambdaQuery3.andEq(HandsOn::getOrgId, uniOrgId);
} // }
if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){ // if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){
lambdaQuery3.andBetween(HandsOn::getAddTime, startTime, endTime); // lambdaQuery3.andBetween(HandsOn::getAddTime, startTime, endTime);
} // }
int values = lambdaQuery3.andEq(HandsOn::getHandsOnStatus, 1) // int values = lambdaQuery3.andEq(HandsOn::getHandsOnStatus, 1)
.select().size(); // .select().size();
LambdaQuery<ResourcesTraining> lambdaQuery4 = resourcesTrainingService.createLambdaQuery(); // LambdaQuery<ResourcesTraining> lambdaQuery4 = resourcesTrainingService.createLambdaQuery();
if (uniOrgId != null && uniOrgId != 1) { // if (uniOrgId != null && uniOrgId != 1) {
lambdaQuery4.andEq(ResourcesTraining::getOrgId, uniOrgId); // lambdaQuery4.andEq(ResourcesTraining::getOrgId, uniOrgId);
} // }
if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){ // if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){
lambdaQuery4.andBetween(ResourcesTraining::getAddTime, startTime, endTime); // lambdaQuery4.andBetween(ResourcesTraining::getAddTime, startTime, endTime);
} // }
int values2 = lambdaQuery4.andEq(ResourcesTraining::getResourcesTrainingStatus, 1) // int values2 = lambdaQuery4.andEq(ResourcesTraining::getResourcesTrainingStatus, 1)
.select().size(); // .select().size();
LambdaQuery<ResourcesCompetition> lambdaQuery5 = resourcesCompetitionService.createLambdaQuery(); // LambdaQuery<ResourcesCompetition> lambdaQuery5 = resourcesCompetitionService.createLambdaQuery();
if (uniOrgId != null && uniOrgId != 1) { // if (uniOrgId != null && uniOrgId != 1) {
lambdaQuery5.andEq(ResourcesCompetition::getOrgId, uniOrgId); // lambdaQuery5.andEq(ResourcesCompetition::getOrgId, uniOrgId);
} // }
if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){ // if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){
lambdaQuery5.andBetween(ResourcesCompetition::getAddTime, startTime, endTime); // lambdaQuery5.andBetween(ResourcesCompetition::getAddTime, startTime, endTime);
} // }
int values3 = lambdaQuery5.andEq(ResourcesCompetition::getResourcesCompetitionStatus, 1) // int values3 = lambdaQuery5.andEq(ResourcesCompetition::getResourcesCompetitionStatus, 1)
.select().size(); // .select().size();
data.put("caseNumber", values + values2 + values3); // data.put("caseNumber", values + values2 + values3);
//视频数量 // //视频数量
ResourcesInfoQuery resourcesInfoQuery = new ResourcesInfoQuery(); // ResourcesInfoQuery resourcesInfoQuery = new ResourcesInfoQuery();
resourcesInfoQuery.setResourcesInfoType(1); // resourcesInfoQuery.setResourcesInfoType(1);
resourcesInfoQuery.setStartTime(stime); // resourcesInfoQuery.setStartTime(stime);
resourcesInfoQuery.setEndTime(etime); // resourcesInfoQuery.setEndTime(etime);
if (uniOrgId != null && uniOrgId != 1) { // if (uniOrgId != null && uniOrgId != 1) {
resourcesInfoQuery.setOrgId(uniOrgId); // resourcesInfoQuery.setOrgId(uniOrgId);
} // }
List<ResourcesInfo> videoNumber = resourcesInfoService.getValues(resourcesInfoQuery); // List<ResourcesInfo> videoNumber = resourcesInfoService.getValues(resourcesInfoQuery);
data.put("videoNumber", videoNumber.size()); // data.put("videoNumber", videoNumber.size());
//题库数量 // //题库数量
ResourcesQuestionQuery paras1 = new ResourcesQuestionQuery(); // ResourcesQuestionQuery paras1 = new ResourcesQuestionQuery();
paras1.setQuestionStatus(1); // paras1.setQuestionStatus(1);
if (uniOrgId != null && uniOrgId != 1) { // if (uniOrgId != null && uniOrgId != 1) {
paras1.setOrgId(uniOrgId); // paras1.setOrgId(uniOrgId);
} // }
if (ObjectUtil.isNotEmpty(startTime)){ // if (ObjectUtil.isNotEmpty(startTime)){
paras1.setStartTime(startTime); // paras1.setStartTime(startTime);
} // }
if (ObjectUtil.isNotEmpty(endTime)){ // if (ObjectUtil.isNotEmpty(endTime)){
paras1.setEndTime(endTime); // paras1.setEndTime(endTime);
} // }
List<ResourcesQuestion> questionList = resourcesQuestionService.getValues(paras1); // List<ResourcesQuestion> questionList = resourcesQuestionService.getValues(paras1);
data.put("questionNumber", questionList.size()); // data.put("questionNumber", questionList.size());
//院校数量 // //院校数量
UniversitiesCollegesQuery paras = new UniversitiesCollegesQuery(); // UniversitiesCollegesQuery paras = new UniversitiesCollegesQuery();
paras.setUniversitiesCollegesStatus(1); // paras.setUniversitiesCollegesStatus(1);
if (uniOrgId != null && uniOrgId != 1) { // if (uniOrgId != null && uniOrgId != 1) {
paras.setOrgId(uniOrgId); // paras.setOrgId(uniOrgId);
} // }
if (ObjectUtil.isNotEmpty(startTime)){ // if (ObjectUtil.isNotEmpty(startTime)){
paras.setStartTime(startTime); // paras.setStartTime(startTime);
} // }
if (ObjectUtil.isNotEmpty(endTime)){ // if (ObjectUtil.isNotEmpty(endTime)){
paras.setEndTime(endTime); // paras.setEndTime(endTime);
} // }
List<UniversitiesColleges> schoolList = universitiesCollegesService.getValues(paras); // List<UniversitiesColleges> schoolList = universitiesCollegesService.getValues(paras);
data.put("schoolNumber", schoolList.size()); // data.put("schoolNumber", schoolList.size());
return data; return data;
} }

5
web/src/main/java/com/ibeetl/jlw/service/StudentService.java
Unescape Escape View File

@ -833,6 +833,11 @@ public class StudentService extends CoreBaseService<Student> {
return sqlManager.select(SqlId.of("jlw.student.getStudentValues"), Student.class, paras); return sqlManager.select(SqlId.of("jlw.student.getStudentValues"), Student.class, paras);
} }
public List<Student> getValuesByOrgId(Long orgId) {
return studentDao.getValuesByOrgId(orgId);
}
public List<Student> getValuesByQuery(StudentQuery studentQuery) { public List<Student> getValuesByQuery(StudentQuery studentQuery) {
List<Student> valuesByQuery = studentDao.getValuesByQuery(studentQuery); List<Student> valuesByQuery = studentDao.getValuesByQuery(studentQuery);
queryListAfter(valuesByQuery); queryListAfter(valuesByQuery);

9
web/src/main/java/com/ibeetl/jlw/web/AccountController.java
Unescape Escape View File

@ -138,12 +138,11 @@ public class AccountController {
} }
@ApiOperation("为学生账号创建基础资金表") @ApiOperation("为学生账号创建基础资金表")
@PostMapping("createFund.json") @PostMapping("createFund.json")
public void createFund() throws SQLException { public void createFund() throws SQLException {
List<Student> students = studentService.getValues(null); List<Student> students = studentService.getValuesByOrgId(115L);
int i = 0; int i = 0;
if (students != null && students.size() > 0) { if (students != null && students.size() > 0) {
for (Student student : students) { for (Student student : students) {
@ -180,7 +179,13 @@ public class AccountController {
PreparedStatement preparedStatement = connection.prepareStatement(sql); PreparedStatement preparedStatement = connection.prepareStatement(sql);
ResultSet resultSet = preparedStatement.executeQuery(); ResultSet resultSet = preparedStatement.executeQuery();
while (resultSet.next()) { while (resultSet.next()) {
List<StudentAccountAssetAllocation> studentAccountAssetAllocations = studentAccountAssetAllocationService.getInfoByStudentId(student.getStudentId());
if (studentAccountAssetAllocations != null && studentAccountAssetAllocations.size() == 8) {
continue;
}
StudentAccountAssetAllocationQuery allocationQuery = new StudentAccountAssetAllocationQuery(); StudentAccountAssetAllocationQuery allocationQuery = new StudentAccountAssetAllocationQuery();
Integer applicationId = resultSet.getInt("ApplicationId"); Integer applicationId = resultSet.getInt("ApplicationId");
String applicationName = resultSet.getString("name"); String applicationName = resultSet.getString("name");
Double initialCapital = resultSet.getDouble("InitialCapital"); Double initialCapital = resultSet.getDouble("InitialCapital");

4
web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java
Unescape Escape View File

@ -73,8 +73,8 @@ public class StatisticalAnalysisController {
@RequestParam(value = "etime", required = false) Date etime, @RequestParam(value = "etime", required = false) Date etime,
@SCoreUser CoreUser coreUser) { @SCoreUser CoreUser coreUser) {
UniversitiesColleges uc = universitiesCollegesService.getByOrgId(coreUser.getOrgId()); UniversitiesColleges uc = universitiesCollegesService.getByOrgId(coreUser.getOrgId());
// Map<String, Object> detail = statisticalAnalysisService.adminIndexDetail(stime, etime, uc, coreUser); Map<String, Object> detail = statisticalAnalysisService.adminIndexDetail(stime, etime, uc, coreUser);
Map<String, Object> detail = null; // Map<String, Object> detail = null;
return JsonResult.success(detail); return JsonResult.success(detail);
} }

4
web/src/main/resources/sql/jlw/student.md
Unescape Escape View File

@ -2219,3 +2219,7 @@ select student.student_sn as studentNo,student.student_name as name,school_class
getStudentByStudentNoAndOrgId getStudentByStudentNoAndOrgId
=== ===
select * from student where student_sn = #studentNo# and org_id = #orgId# select * from student where student_sn = #studentNo# and org_id = #orgId#
getValuesByOrgId
===
select * from student where org_id = #orgId#

4
web/src/main/resources/templates/jlw/previewPage/previewData.html
Unescape Escape View File

@ -81,9 +81,7 @@
$("#InformationURL").show(); $("#InformationURL").show();
$("#twxs").hide(); $("#twxs").hide();
$("#player-con").hide(); $("#player-con").hide();
// $('#InformationURL').attr('src', 'https://view.officeapps.live.com/op/view.aspx?src='+Common.isHttp(resourcesInfoContent)); $('#InformationURL').attr('src', 'https://view.officeapps.live.com/op/view.aspx?src='+Common.isHttp(resourcesInfoContent));
resourcesInfoContent = 'http://zycloud.sztzjy.com'+resourcesInfoContent;
$('#InformationURL').attr('src', 'https://view.officeapps.live.com/op/view.aspx?src='+resourcesInfoContent);
}else if(resourcesInfoType == 1){ }else if(resourcesInfoType == 1){
$(".wordHeader").hide();//隐藏 $(".wordHeader").hide();//隐藏
$("#pdfInfo").hide(); $("#pdfInfo").hide();

Write Preview
Loading…
Cancel
Save