1、课外训练

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentCourseHomeworkReplyQueryInfo.java

@@ -17,14 +17,14 @@ public class StudentCourseHomeworkReplyQueryInfo extends QueryInfo {
 
     private Integer userId;
 
-    private boolean isExtra;
+    private boolean extra;
 
     public boolean isExtra() {
-        return isExtra;
+        return extra;
     }
 
-    public void setIsExtra(boolean isExtra) {
-        isExtra = isExtra;
+    public void setExtra(boolean extra) {
+        this.extra = extra;
     }
 
     public Integer getUserId() {

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

@@ -80,12 +80,16 @@
 	<sql id="StudentExtraCommentsQueryCondition">
 		<where>
 			<if test="studentCourseHomeworkId!=null">
-				extracurricular_exercises_reply_id_=#{studentCourseHomeworkId}
+				AND extracurricular_exercises_reply_id_=#{studentCourseHomeworkId}
+			</if>
+			<if test="userId!=null">
+				AND eer.user_id_=#{userId}
 			</if>
 		</where>
 	</sql>
 	<select id="countStudentExtraComments" resultType="int">
-		SELECT COUNT(id_) FROM extracurricular_exercises_message
+		SELECT COUNT(eem.id_) FROM extracurricular_exercises_message eem
+		LEFT JOIN extracurricular_exercises_reply eer ON eer.id_=eem.extracurricular_exercises_reply_id_
 		<include refid="StudentExtraCommentsQueryCondition"/>
 	</select>
 	<select id="findStudentExtraComments" resultMap="com.ym.mec.biz.dal.dao.StudentCourseHomeworkReplyDao.studentCourseHomeworkComment">
@@ -100,8 +104,9 @@
 		FROM
 			extracurricular_exercises_message eem
 		LEFT JOIN sys_user suc ON eem.user_id_=suc.id_
+		LEFT JOIN extracurricular_exercises_reply eer ON eer.id_=eem.extracurricular_exercises_reply_id_
 		<include refid="StudentExtraCommentsQueryCondition"/>
-		ORDER BY schr.id_ DESC
+		ORDER BY eem.id_ DESC
 		<include refid="global.limit"/>
 	</select>
 </mapper>

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

@@ -132,16 +132,16 @@
 
 	<sql id="queryStudentExtraExercisesCondition">
 		<where>
-			<if test="teacherId!=null">
-				user_id_=#{studentId}
+			<if test="studentId!=null">
+				AND eer.user_id_=#{studentId}
 			</if>
 			<if test="createTime!=null">
-				DATE_FORMAT(create_time_, '%Y-%m-%d') = DATE_FORMAT(#{createTime}, '%Y-%m-%d')
+				AND DATE_FORMAT(eer.create_time_, '%Y-%m-%d') = DATE_FORMAT(#{createTime}, '%Y-%m-%d')
 			</if>
 		</where>
 	</sql>
 	<select id="countStudentExtraExercises" resultType="int">
-		SELECT COUNT(id_) FROM extracurricular_exercises_reply
+		SELECT COUNT(id_) FROM extracurricular_exercises_reply eer
 		<include refid="queryStudentExtraExercisesCondition"/>
 	</select>
 	<select id="findStudentExtraExercises" resultMap="ExtraExerciseStudentsDto">
@@ -149,7 +149,7 @@
 			eer.*,
 			ee.teacher_id_,
 			tea.real_name_ teacher_name_,
-			su.student_name_
+			su.username_ student_name_
 		FROM
 			extracurricular_exercises_reply eer
 			LEFT JOIN extracurricular_exercises ee ON ee.id_=eer.extracurricular_exercises_id_

mec-student/src/main/java/com/ym/mec/student/controller/StudentCourseHomeworkController.java

@@ -83,12 +83,12 @@ public class StudentCourseHomeworkController extends BaseController {
 
     @ApiOperation(value = "获取学生作业界面详细信息-公用")
     @GetMapping(value = "/findCourseHomeworkStudentDetailPublic")
-    public Object findCourseHomeworkStudentDetailPublic(Long courseScheduleID, boolean isExtra) {
+    public Object findCourseHomeworkStudentDetailPublic(Long courseScheduleID, boolean extra) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(user)){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
-        if(!isExtra){
+        if(!extra){
             return succeed(studentCourseHomeworkService.findCourseHomeworkStudentDetail(courseScheduleID,user.getId().longValue()));
         }else{
             return succeed(extracurricularExercisesReplyService.findStudentExtraExerciseDetail(courseScheduleID));

mec-teacher/src/main/java/com/ym/mec/teacher/controller/CourseHomeworkController.java

@@ -58,8 +58,8 @@ public class CourseHomeworkController extends BaseController {
 
     @ApiOperation(value = "根据课程计划获取需要交作业的学生-公用")
     @GetMapping("/findCourseStudentsPublic")
-    public Object findCourseStudentsPublic(Long courseScheduleId,String userName, boolean isExtra){
-        if(!isExtra){
+    public Object findCourseStudentsPublic(Long courseScheduleId,String userName, boolean extra){
+        if(!extra){
             return succeed(studentCourseHomeworkService.findStudentCourseHomeworkByCourse(courseScheduleId,userName));
         }else{
             return succeed(extracurricularExercisesReplyService.findExtraExerciseStudents(courseScheduleId,userName));
@@ -85,12 +85,12 @@ public class CourseHomeworkController extends BaseController {
 
     @ApiOperation(value = "获取学生作业界面详细信息-公用")
     @GetMapping(value = "/findCourseHomeworkStudentDetailPublic")
-    public Object findCourseHomeworkStudentDetailPublic(Long courseScheduleID,Long userId, boolean isExtra){
+    public Object findCourseHomeworkStudentDetailPublic(Long courseScheduleID,Long userId, boolean extra){
         StudentCourseHomework studentCourseHomework1 = studentCourseHomeworkService.get(courseScheduleID);
         if(Objects.isNull(studentCourseHomework1)){
             return failed("作业不存在");
         }
-        if(!isExtra){
+        if(!extra){
             CourseHomeworkStudentDetailDto courseHomeworkStudentDetail = studentCourseHomeworkService.findCourseHomeworkStudentDetail(studentCourseHomework1.getCourseScheduleId(), userId);
             if(Objects.nonNull(courseHomeworkStudentDetail)){
                 StudentCourseHomework studentCourseHomework=new StudentCourseHomework();

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseHomeworkReplyController.java

@@ -73,7 +73,7 @@ public class TeacherCourseHomeworkReplyController extends BaseController {
     }
 
     @ApiOperation(value = "回复查询-公用")
-    @PostMapping("/queryPagePublic")
+    @GetMapping("/queryPagePublic")
     public Object queryPagePublic(StudentCourseHomeworkReplyQueryInfo queryInfo){
         if(!queryInfo.isExtra()){
             return succeed(studentCourseHomeworkReplyService.queryPage(queryInfo));