教师端首页

web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherIndexData.java

@@ -1,6 +1,9 @@
 package com.ibeetl.jlw.entity.api.teacher;
 
-import com.ibeetl.jlw.entity.*;
+import com.ibeetl.jlw.entity.ResourcesApplication;
+import com.ibeetl.jlw.entity.StudentHandsOnTaskReport;
+import com.ibeetl.jlw.entity.TeacherOpenCourseMergeTeacher;
+import com.ibeetl.jlw.entity.TeacherOpenCourseNotice;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -35,7 +38,7 @@ public class TeacherIndexData {
     /**
      * 我的应用
      */
-    private List<TeacherMergeApplication> myApplicationList;
+    private List<ResourcesApplication> myApplicationList;
 
     /**
      * 我的开课

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

@@ -1,8 +1,10 @@
 package com.ibeetl.jlw.service;
 
 
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.jlw.dao.ResourcesApplicationCourseDao;
@@ -173,6 +175,10 @@ public class ResourcesApplicationService extends CoreBaseService<ResourcesApplic
         List<Long> resourcesApplicationIdList = systemList.stream()
                 .map(UniversitiesCollegesJurisdictionExperimentalSystem::getTypeId).collect(Collectors.toList());
 
+
+        if(ObjectUtil.isEmpty(resourcesApplicationIdList)) {
+            return ListUtil.empty();
+        }
         // 根据应用ID查询应用信息
         return resourcesApplicationDao.selectByIds(resourcesApplicationIdList);
     }

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

@@ -1,43 +1,28 @@
 package com.ibeetl.jlw.service;
 
-import java.io.*;
+import cn.hutool.core.collection.ListUtil;
-import java.text.DateFormat;
+import cn.hutool.core.util.ObjectUtil;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.math.BigDecimal;
-
 import cn.jlw.util.ToolUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.ibeetl.admin.core.entity.CoreUser;
+import com.ibeetl.admin.core.service.CoreBaseService;
-import com.ibeetl.admin.core.util.TimeTool;
+import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.StudentHandsOnTaskReportDao;
 import com.ibeetl.jlw.entity.StudentHandsOnTaskReport;
 import com.ibeetl.jlw.web.query.StudentHandsOnTaskReportQuery;
-import com.ibeetl.jlw.entity.FileEntity;
-
-import com.ibeetl.admin.core.service.CoreBaseService;
-import com.ibeetl.admin.core.util.PlatformException;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.beetl.sql.core.engine.PageQuery;
 import org.beetl.sql.core.SqlId;
-import javax.annotation.Resource;
+import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-
+import java.util.ArrayList;
-import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 学生-课程实操-报告撰写 Service
@@ -169,6 +154,9 @@ public class StudentHandsOnTaskReportService extends CoreBaseService<StudentHand
     }
 
     public List<StudentHandsOnTaskReport> getReportList(List<Long> collect) {
+        if(ObjectUtil.isEmpty(collect)) {
+            return ListUtil.empty();
+        }
         return studentHandsOnTaskReportDao.getReportList(collect);
     }
 

web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java

@@ -5,14 +5,11 @@ import com.ibeetl.jlw.dao.TeacherMergeApplicationDao;
 import com.ibeetl.jlw.entity.*;
 import com.ibeetl.jlw.entity.api.CurrentUserInfo;
 import com.ibeetl.jlw.entity.api.teacher.TeacherIndexData;
-import com.ibeetl.jlw.service.IndexBaseService;
+import com.ibeetl.jlw.service.*;
-import com.ibeetl.jlw.service.StudentHandsOnTaskReportService;
-import com.ibeetl.jlw.service.TeacherOpenCourseMergeTeacherService;
-import com.ibeetl.jlw.service.TeacherOpenCourseNoticeService;
 import com.ibeetl.jlw.web.query.TeacherMergeApplicationQuery;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeTeacherQuery;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseNoticeQuery;
-import org.assertj.core.util.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -39,6 +36,11 @@ public class ApiTeacherService {
 
     @Resource private StudentHandsOnTaskReportService studentHandsOnTaskReportService;
 
+    @Autowired
+    private ResourcesApplicationService resourcesApplicationService;
+    @Autowired
+    private TeacherService teacherService;
+
     /**
      * 教师端-首页数据
      * @return
@@ -53,22 +55,26 @@ 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.getValuesByQuery(teacherOpenCourseNoticeQuery);
+        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());
+
         // 我的开课信息
         TeacherOpenCourseMergeTeacherQuery teacherOpenCourseMergeTeacherQuery = new TeacherOpenCourseMergeTeacherQuery();
         teacherOpenCourseMergeTeacherQuery.setTeacherId(teacherId);
-        List<TeacherOpenCourseMergeTeacher> openCourseList = teacherOpenCourseMergeTeacherService.getValuesByQuery(teacherOpenCourseMergeTeacherQuery);
+        List<TeacherOpenCourseMergeTeacher> openCourseList = teacherOpenCourseMergeTeacherService.getValues(teacherOpenCourseMergeTeacherQuery);
 
         // 实训评阅列表查询
         List<Long> collect = openCourseList.stream().map(TeacherOpenCourseMergeTeacher::getTeacherOpenCourseId).collect(Collectors.toList());
@@ -78,7 +84,7 @@ public class ApiTeacherService {
         return TeacherIndexData.builder()
                 .toDoList(reportList)
                 .noticeList(noticeList)
-                .myApplicationList(applicationList)
+                .myApplicationList(resourcesApplicationList)
                 .myOpenCourseList(openCourseList)
                 .build();
     }

web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationQuery.java

@@ -45,6 +45,16 @@ public class ResourcesApplicationQuery extends PageParam {
 
     private String courseInfoIds;
 
+    /**
+     * 教师ID，查询排序列表用
+      */
+    private Long teacherId;
+
+    /**
+     * 学生ID，查询排序列表用
+     */
+    private Long studentId;
+
     public Long getResourcesApplicationId(){
         return  resourcesApplicationId;
     }
@@ -181,4 +191,19 @@ public class ResourcesApplicationQuery extends PageParam {
     }
 
 
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
 }

web/src/main/resources/sql/jlw/resourcesApplication.md

@@ -7,6 +7,7 @@ queryByCondition
     t.*
       @}
     from resources_application t
+    left 
     left join teacher_merge_application ta on ta.resources_application_id = t.resources_application_id
     where 1=1  
       @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行  

web/src/main/resources/sql/jlw/teacherMergeApplication.md

@@ -250,7 +250,7 @@ getValuesByQueryOrderByIndex
 
   select t.*
   from teacher_merge_application t
-  where 1=1 and #function("teacherMergeApplication.query")#
+  where 1=1
   @if(!isEmpty(teacherMergeApplicationId)){
   and t.teacher_merge_application_id =#teacherMergeApplicationId#
   @}