课程评价

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

@@ -27,6 +27,16 @@ public class EvaluateCourseDto {
     @ApiModelProperty(value = "教学点")
     private String schoolName;
 
+    private Integer courseScheduleReviewId;
+
+    public Integer getCourseScheduleReviewId() {
+        return courseScheduleReviewId;
+    }
+
+    public void setCourseScheduleReviewId(Integer courseScheduleReviewId) {
+        this.courseScheduleReviewId = courseScheduleReviewId;
+    }
+
     public Long getCourseScheduleId() {
         return courseScheduleId;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkReplyServiceImpl.java

@@ -38,8 +38,6 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 	@Autowired
 	private TeacherDao teacherDao;
 	@Autowired
-	private SysConfigDao sysConfigDao;
-	@Autowired
 	private SysMessageService sysMessageService;
 	@Autowired
 	private StudentServeService studentServeService;

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

@@ -3926,6 +3926,7 @@
         <result property="courseScheduleId" column="course_schedule_id_"/>
         <result property="courseName" column="name_"/>
         <result property="schoolName" column="school_name_"/>
+        <result property="courseScheduleReviewId" column="course_schedule_review_id_"/>
     </resultMap>
     <sql id="queryCourseEvaluateSql">
         <where>
@@ -3942,9 +3943,10 @@
     </sql>
     <select id="queryCourseEvaluateList" resultMap="EvaluateCourseDto">
         SELECT cs.id_ course_schedule_id_,CONCAT(cs.class_date_," ",cs.start_class_time_) class_start_time_,
-               CONCAT(cs.class_date_," ",cs.end_class_time_) class_end_time_,
+               CONCAT(cs.class_date_," ",cs.end_class_time_) class_end_time_,csr.id_ course_schedule_review_id_,
                cs.name_,cs.group_type_,cs.type_,cs.teach_mode_,CASE WHEN s.name_ IS NULL THEN '网络教室' ELSE s.name_ END school_name_
         FROM course_schedule cs
+        LEFT JOIN course_schedule_review csr ON csr.course_schedule_id_ = cs.id_
         LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
         LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND sa.status_ = 'NORMAL'
         LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
@@ -3962,10 +3964,9 @@
         <include refid="queryCourseEvaluateSql"/>
     </select>
     <select id="countStudyStandard" resultType="java.lang.Integer">
-        SELECT COUNT(cssp.user_id_)
-        FROM course_schedule_student_payment cssp
-        LEFT JOIN student_attendance sa ON sa.user_id_ = cssp.user_id_ AND sa.course_schedule_id_ = cssp.course_schedule_id_
-        WHERE sa.id_ IS NOT NULL AND cssp.course_schedule_id_ = #{courseScheduleId}
+        SELECT COUNT(sa.user_id_)
+        FROM student_attendance sa
+        WHERE sa.id_ IS NOT NULL AND sa.course_schedule_id_ = #{courseScheduleId}
     </select>
     <resultMap id="StudentStandardDto" type="com.ym.mec.biz.dal.dto.StudentStandardDto">
         <result property="qualifiedFlag" column="qualified_flag_"/>
@@ -3976,13 +3977,12 @@
         <result property="classDate" column="class_date_"/>
     </resultMap>
     <select id="queryStudyStandard" resultMap="StudentStandardDto">
-        SELECT su.avatar_,su.username_,cssp.user_id_,sb.name_ subject_name_,cssp.qualified_flag_
-        FROM course_schedule_student_payment cssp
-        LEFT JOIN student_attendance sa ON sa.user_id_ = cssp.user_id_ AND sa.course_schedule_id_ = cssp.course_schedule_id_
-        LEFT JOIN student s ON s.user_id_ = cssp.user_id_
+        SELECT su.avatar_,su.username_,sa.user_id_,sb.name_ subject_name_,sa.qualified_flag_
+        FROM student_attendance sa
+        LEFT JOIN student s ON s.user_id_ = sa.user_id_
         LEFT JOIN `subject` sb ON sb.id_ = s.subject_id_list_
         LEFT JOIN sys_user su ON su.id_ = s.user_id_
-        WHERE sa.id_ IS NOT NULL AND cssp.course_schedule_id_ = #{courseScheduleId}
+        WHERE sa.id_ IS NOT NULL AND sa.course_schedule_id_ = #{courseScheduleId}
         <include refid="global.limit"/>
     </select>
     <select id="countStudyStandardWaitVisit" resultType="java.lang.Integer">

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

@@ -366,7 +366,7 @@ public class TeacherCourseScheduleController extends BaseController {
     @ApiOperation(value = "课程评价列表")
     @PostMapping("/courseEvaluateList")
     @AuditLogAnnotation(operateName = "课程评价列表")
-    public HttpResponseResult courseEvaluateList(EvaluateCourseQueryInfo queryInfo){
+    public HttpResponseResult courseEvaluateList(@RequestBody EvaluateCourseQueryInfo queryInfo){
         SysUser user = sysUserFeignService.queryUserInfo();
         if(null==user){
             return failed(HttpStatus.FORBIDDEN, "请登录");