Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentVisitCourseHomeWorkDto.java

@@ -0,0 +1,62 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.StudentCourseHomework;
+import io.swagger.annotations.ApiModelProperty;
+
+public class StudentVisitCourseHomeWorkDto extends StudentCourseHomework {
+
+    @ApiModelProperty(value = "课程名称",required = false)
+    private String courseName;
+
+    @ApiModelProperty(value = "课程组名称",required = false)
+    private String groupName;
+
+    @ApiModelProperty(value = "布置老师",required = false)
+    private String teacherName;
+
+    @ApiModelProperty(value = "作业标题",required = false)
+    private String title;
+
+    @ApiModelProperty(value = "作业内容",required = false)
+    private String content;
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+}

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

@@ -50,7 +50,7 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="StudentCourseHomework">
-		SELECT * FROM student_course_homework WHERE id_ = #{id} 
+		SELECT * FROM student_course_homework WHERE id_ = #{id}
 	</select>
 
     <!-- 全查询 -->
@@ -128,7 +128,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM student_course_homework WHERE id_ = #{id} 
+		DELETE FROM student_course_homework WHERE id_ = #{id}
 	</delete>
 
     <resultMap type="com.ym.mec.biz.dal.dto.CourseHomeworkListDto" id="CourseHomeworkDto">
@@ -415,13 +415,22 @@
     </select>
 
     <delete id="delByCourseScheduleId">
-		DELETE FROM student_course_homework WHERE course_schedule_id_ = #{courseScheduleId} 
+		DELETE FROM student_course_homework WHERE course_schedule_id_ = #{courseScheduleId}
 	</delete>
-    
+
     <delete id="batchDelByCourseScheduleId">
 		DELETE FROM student_course_homework WHERE course_schedule_id_ IN
 		<foreach collection="courseScheduleIdList" item="courseScheduleId" open="(" close=")" separator=",">
 			#{courseScheduleId}
 		</foreach>
 	</delete>
+
+    <select id="getStudentCourseHomeWorks" resultType="com.ym.mec.biz.dal.dto.StudentVisitCourseHomeWorkDto">
+        SELECT sch.course_schedule_id_ courseScheduleId,cs.name_ courseName,sch.create_time_ createTime,t.real_name_ teacherName,
+            ch.content_
+        FROM student_course_homework sch
+        LEFT JOIN course_homework ch ON ch.id_ = sch.course_homework_id_
+        LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
+        LEFT JOIN sys_user t ON t.id_ = cs.actual_teacher_id_
+    </select>
 </mapper>

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

@@ -359,7 +359,7 @@
 	</select>
 
 	<select id="queryAuditPage" parameterType="map" resultMap="StudentPaymentRouteOrderMap">
-		SELECT spro.*,u.username_,u.phone_,s.name_ school_name_,o.name_ organ_name_,ou.username_ operator_name_ FROM student_payment_route_order spro
+		SELECT spro.*,u.username_,u.phone_,s.name_ school_name_,o.name_ organ_name_,ou.real_name_ operator_name_ FROM student_payment_route_order spro
         left join sys_user u on spro.user_id_ = u.id_
         left join sys_user ou on ou.id_ = spro.create_by_
         left join cooperation_organ s on s.id_ = spro.school_id_

mec-web/src/main/java/com/ym/mec/web/controller/WebCourseHomeworkController.java

@@ -5,18 +5,24 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.page.CourseHomeWorkTemplateQueryInfo;
+import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.service.CourseHomeworkService;
+import com.ym.mec.biz.service.StudentCourseHomeworkService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Author zouxuan
@@ -33,6 +39,8 @@ public class WebCourseHomeworkController extends BaseController {
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private EmployeeDao employeeDao;
+    @Autowired
+    private StudentCourseHomeworkService studentCourseHomeworkService;
 
     @ApiOperation(value = "分页查询作业列表")
     @GetMapping(value = "/queryHomePage")
@@ -57,4 +65,12 @@ public class WebCourseHomeworkController extends BaseController {
         return succeed(courseHomeworkService.queryHomePage(queryInfo));
     }
 
+
+    @ApiOperation(value = "获取学生作业记录")
+    @GetMapping(value = "/findStudentHomeworkRecord")
+    @PreAuthorize("@pcs.hasPermissions('webCurseHomework/findStudentHomeworkRecord')")
+    public HttpResponseResult findStudentHomeworkRecord(CourseHomeworkQueryInfo queryInfo){
+        return succeed(studentCourseHomeworkService.findStudentHomeworkRecord(queryInfo));
+    }
+
 }