1、课酬确认相关

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

@@ -42,6 +42,9 @@ public class CourseReviewDto {
     @ApiModelProperty(value = "学员评分",required = false)
     private Integer studentReview;
 
+    @ApiModelProperty(value = "是否布置作业")
+    private Integer assignHomework;
+
     @ApiModelProperty(value = "是否提交作业",required = false)
     private Integer handHomework;
 
@@ -123,6 +126,14 @@ public class CourseReviewDto {
     @ApiModelProperty(value = "考勤Str",required = false)
     private String attendanceStr;
 
+    public Integer getAssignHomework() {
+        return assignHomework;
+    }
+
+    public void setAssignHomework(Integer assignHomework) {
+        this.assignHomework = assignHomework;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

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

@@ -29,6 +29,9 @@ public class CourseReviewQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否评价 1-评价 0未评价",required = false)
     private Integer hasReview;
 
+    @ApiModelProperty(value = "是否布置作业")
+    private Integer assignHomework;
+
     @ApiModelProperty(value = "是否提价作业 1-提交 0未提交",required = false)
     private Integer hasHandHomework;
 
@@ -53,6 +56,14 @@ public class CourseReviewQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "作业是否回复",required = false)
     private Integer homeWorkReplied;
 
+    public Integer getAssignHomework() {
+        return assignHomework;
+    }
+
+    public void setAssignHomework(Integer assignHomework) {
+        this.assignHomework = assignHomework;
+    }
+
     public Integer getTeacherId() {
         return teacherId;
     }

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

@@ -141,6 +141,7 @@
         <result column="review_id_" property="reviewId"/>
         <result column="student_review_" property="studentReview"/>
         <result column="hand_homework_" property="handHomework"/>
+        <result column="assign_homework_" property="assignHomework"/>
         <result column="course_review_" property="courseReview"/>
         <result column="teacher_id" property="teacherId"/>
         <result column="start_class_time_" jdbcType="DATE" property="startClassTime"/>
@@ -190,6 +191,12 @@
             <if test="studentReview !=null">
                 AND csc.score_ =#{studentReview}
             </if>
+            <if test="assignHomework != null and assignHomework == 1">
+                AND sch.id_>0
+            </if>
+            <if test="assignHomework != null and assignHomework ==0">
+                AND sch.id_ IS NULL
+            </if>
             <if test='hasReview !=null and hasReview=="1"'>
                 AND csr.id_ > 0
             </if>
@@ -239,7 +246,8 @@
         edu_teacher_name_,pg.buy_months_,csr.id_ review_id_, csc.score_ student_review_,
         csr.hand_homework_,csr.course_review_,pg.student_id_,csr.teaching_material_,csr.pronunciation_,csr.tempo_,
         csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_,csr.update_time_,sa.id_
-        attendance_id_,sch.is_replied_ home_work_replied_
+        attendance_id_,sch.is_replied_ home_work_replied_,
+        CASE WHEN sch.id_ IS NULL THEN 0 ELSE 1 END assign_homework_
         FROM course_schedule cs
         LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_ AND cs.group_type_='PRACTICE'
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_