feat:衔接老师

mec-biz/src/main/resources/config/mybatis/ExtracurricularExercisesReplyMapper.xml

@@ -528,7 +528,6 @@
     <select id="getEduHomeworkList" resultType="com.ym.mec.biz.dal.dto.EduHomeworkCardDto">
 		SELECT
 			ee.id_ homeworkId,
-		    ee.content_ content,
 			su.real_name_ teacherName,
 			ee.create_time_ createTime,
 			COUNT( eer.user_id_ ) exceptStudentNum,

mec-biz/src/main/resources/config/mybatis/StudentCourseHomeworkMapper.xml

@@ -503,7 +503,6 @@
     <select id="getEduCourseHomeworkList" resultType="com.ym.mec.biz.dal.dto.EduHomeworkCardDto">
         SELECT
             ch.id_ homeworkId,
-            ch.content_ content,
             cs.id_ courseId,
             cs.name_ courseName,
             CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) courseStartTime,

mec-web/src/main/java/com/ym/mec/web/controller/education/CourseHomeworkController.java

@@ -3,8 +3,10 @@ package com.ym.mec.web.controller.education;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.CourseHomework;
+import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.biz.dal.page.StudentCourseHomeWorkQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
+import com.ym.mec.biz.service.ExtracurricularExercisesService;
 import com.ym.mec.biz.service.StudentCourseHomeworkService;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -41,6 +43,8 @@ public class CourseHomeworkController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
     @Autowired
+    private ExtracurricularExercisesService extracurricularExercisesService;
+    @Autowired
     private ExtracurricularExercisesReplyService extracurricularExercisesReplyService;
 
     @ApiOperation(value = "分页查询作业列表")
@@ -80,6 +84,10 @@ public class CourseHomeworkController extends BaseController {
             }
             result.put("data", studentCourseHomeworkService.findStudentCourseHomeworkByCourse(null, homeworkId,userName));
         }else{
+            ExtracurricularExercises extracurricularExercises = extracurricularExercisesService.get(homeworkId);
+            if(Objects.nonNull(extracurricularExercises)){
+                result.put("content", extracurricularExercises.getContent());
+            }
             result.put("data", extracurricularExercisesReplyService.findExtraExerciseStudents(homeworkId,userName));
         }
         return succeed(result);