over !

controller/src/main/java/com/koobietech/eas/controller/EasEduScheduleController.java

@@ -7,6 +7,7 @@ import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.common.utils.SecurityManager;
 import com.koobietech.eas.dao.dto.ConflictDto;
 import com.koobietech.eas.dao.dto.ScheduleDto;
+import com.koobietech.eas.dao.pojo.LessonPojo;
 import com.koobietech.eas.dao.pojo.SchedulePojo;
 import com.koobietech.eas.mbg.model.EasEduSchedule;
 import com.koobietech.eas.service.EasEduScheduleService;
@@ -26,6 +27,14 @@ public class EasEduScheduleController {
     @Resource
     EasEduScheduleService easEduScheduleService;
 
+    @GetMapping("/dashboardWorkbench")
+    @Operation(summary = "工作台", description = "工作台")
+    public JsonResult dashboardWorkbench() {
+        LessonPojo ret = easEduScheduleService.dashboardWorkbench();
+
+        return JsonResult.data(ret);
+    }
+
     @PostMapping("/add")
     @Operation(summary = "添加课程表", description = "根据课程和重复预约次数(接下来连续多少天都预约这节课)录入基本课程信息")
     public JsonResult add(@RequestBody EasEduSchedule schedule, @RequestParam int repeatTime) {

dao/src/main/resources/com/koobietech/eas/dao/mapper/AttendanceMapper.xml

@@ -40,7 +40,7 @@
         FROM
             eas_edu_clt_relation
             LEFT JOIN eas_edu_class ON eas_edu_class.id = eas_edu_clt_relation.class_id
-            LEFT JOIN eas_edu_schedule ON eas_edu_schedule.class_id = eas_edu_class.id
+            JOIN eas_edu_schedule ON eas_edu_schedule.class_id = eas_edu_class.id
             LEFT JOIN eas_edu_category ON eas_edu_category.id = eas_edu_schedule.category_id
             LEFT JOIN eas_edu_subjects ON eas_edu_subjects.id = eas_edu_schedule.subjects_id
             LEFT JOIN eas_edu_classroom ON eas_edu_classroom.id = eas_edu_schedule.room_id

service/src/main/java/com/koobietech/eas/service/EasEduScheduleService.java

@@ -3,6 +3,7 @@ package com.koobietech.eas.service;
 import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.dao.dto.ConflictDto;
 import com.koobietech.eas.dao.dto.ScheduleDto;
+import com.koobietech.eas.dao.pojo.LessonPojo;
 import com.koobietech.eas.dao.pojo.SchedulePojo;
 import com.koobietech.eas.mbg.model.EasEduSchedule;
 
@@ -20,4 +21,7 @@ public interface EasEduScheduleService {
     List<SchedulePojo> querySchedule(ScheduleDto schedule);
 
     Boolean queryConflict(ConflictDto conflictDto);
+
+    LessonPojo dashboardWorkbench();
+
 }

service/src/main/java/com/koobietech/eas/service/impl/EasEduScheduleServiceImpl.java

@@ -1,9 +1,13 @@
 package com.koobietech.eas.service.impl;
 
 import com.koobietech.eas.common.result.PageDataResult;
+import com.koobietech.eas.common.utils.SecurityManager;
+import com.koobietech.eas.dao.constant.UserType;
 import com.koobietech.eas.dao.dto.ConflictDto;
 import com.koobietech.eas.dao.dto.ScheduleDto;
+import com.koobietech.eas.dao.mapper.LessonMapper;
 import com.koobietech.eas.dao.mapper.ScheduleMapper;
+import com.koobietech.eas.dao.pojo.LessonPojo;
 import com.koobietech.eas.dao.pojo.SchedulePojo;
 import com.koobietech.eas.mbg.mapper.EasEduClassroomMapper;
 import com.koobietech.eas.mbg.mapper.EasEduScheduleMapper;
@@ -32,6 +36,9 @@ public class EasEduScheduleServiceImpl implements EasEduScheduleService {
     @Resource
     ScheduleMapper scheduleMapper;
 
+    @Resource
+    LessonMapper  lessonMapper;
+
     @Override
     public Boolean update(EasEduSchedule schedule) {
         schedule.setModifyTime(new Date());
@@ -185,4 +192,14 @@ public class EasEduScheduleServiceImpl implements EasEduScheduleService {
         return ret;
 
     }
+
+    @Override
+    public LessonPojo  dashboardWorkbench() {
+        if (SecurityManager.isStudentUser()) {
+          return  lessonMapper.getStudentboard( SecurityManager.getLoginSid().intValue() );
+        } else if ( SecurityManager.getUserType().equals(UserType.teacher) ) {
+           return lessonMapper.getTeacherboard( SecurityManager.getLoginUid().intValue() );
+        }
+        return lessonMapper.getAllboard();
+    }
 }