From 00ecf5f4aa3327944a8c10aa4d3438420f05a38e Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Tue, 20 Dec 2022 10:10:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=AB=AF=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ResourcesApplicationService.java  |  4 ++--
 .../api/teacher/ApiTeacherService.java        | 21 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

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 5e618ba6..9e02f0c4 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java
@@ -186,8 +186,8 @@ public class ResourcesApplicationService extends CoreBaseService<ResourcesApplic
                  // 1：子应用系统
                 .andEq(UniversitiesCollegesJurisdictionExperimentalSystem::getType, 1)
                 .andEq(UniversitiesCollegesJurisdictionExperimentalSystem::getUniversitiesCollegesId, universitiesCollegesId)
-                .andGreatEq(UniversitiesCollegesJurisdictionExperimentalSystem::getUseStartTime, dateTime)
-                .andLess(UniversitiesCollegesJurisdictionExperimentalSystem::getUseEndTime, dateTime)
+                .andLessEq(UniversitiesCollegesJurisdictionExperimentalSystem::getUseStartTime, dateTime)
+                .andGreat(UniversitiesCollegesJurisdictionExperimentalSystem::getUseEndTime, dateTime)
                 .select();
 
         // 获取关联的应用ID集合
diff --git a/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java
index de08c378..914d78c8 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java
@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.service.api.teacher;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import com.ibeetl.jlw.dao.TeacherMergeApplicationDao;
 import com.ibeetl.jlw.entity.*;
@@ -7,9 +8,10 @@ import com.ibeetl.jlw.entity.api.CurrentUserInfo;
 import com.ibeetl.jlw.entity.api.teacher.TeacherIndexData;
 import com.ibeetl.jlw.service.*;
 import com.ibeetl.jlw.service.api.ApiIndexBaseService;
-import com.ibeetl.jlw.web.query.TeacherMergeApplicationQuery;
+import com.ibeetl.jlw.web.query.ResourcesApplicationQuery;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeTeacherQuery;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseNoticeQuery;
+import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -56,21 +58,18 @@ public class ApiTeacherService {
         // 教师ID
         final Long teacherId = ((Teacher) identityInfo).getTeacherId();
 
-        TeacherExtendSchoolInfo teacherExtendSchoolInfo = teacherService.getTeacherExtendSchoolInfo(teacherId.toString());
-
         // 我的通知
         TeacherOpenCourseNoticeQuery teacherOpenCourseNoticeQuery = new TeacherOpenCourseNoticeQuery();
         teacherOpenCourseNoticeQuery.setCreateByTeacherId(teacherId);
         List<TeacherOpenCourseNotice> noticeList = teacherOpenCourseNoticeService.getValues(teacherOpenCourseNoticeQuery);
 
-        // 教师应用信息
-        TeacherMergeApplicationQuery teacherMergeApplicationQuery = new TeacherMergeApplicationQuery();
-        teacherMergeApplicationQuery.setTeacherId(teacherId);
-        List<TeacherMergeApplication> applicationList = teacherMergeApplicationDao.getValuesByQueryOrderByIndex(teacherMergeApplicationQuery);
-
         // 我的应用由来：教师所在的院校，查询关联到的应用
-        List<ResourcesApplication> resourcesApplicationList = resourcesApplicationService
-                .getResourcesApplicationListByUniversitiesCollegesId(teacherExtendSchoolInfo.getUniversitiesCollegesId());
+        ResourcesApplicationQuery resourcesApplicationQuery = new ResourcesApplicationQuery();
+        PageQuery pageQuery = resourcesApplicationQuery.getPageQuery();
+
+        resourcesApplicationQuery.setTeacherId(teacherId);
+        PageQuery<ResourcesApplication> resourcesApplicationPageQuery = resourcesApplicationService.queryMyApplicationByConditionQuery(pageQuery);
+        List<ResourcesApplication> resourcesApplications = CollectionUtil.emptyIfNull(resourcesApplicationPageQuery.getList());
 
         // 我的开课信息
         TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery = new TeacherOpenCourseMergeTeacherQuery();
@@ -85,7 +84,7 @@ public class ApiTeacherService {
         return TeacherIndexData.builder()
                 .toDoList(reportList)
                 .noticeList(noticeList)
-                .myApplicationList(resourcesApplicationList)
+                .myApplicationList(resourcesApplications)
                 .myOpenCourseList(openCourseList)
                 .build();
     }