浏览代码

系统收费作业接口漏改,乐团列表新增收费模式搜索

zouxuan 4 年之前
父节点
当前提交
13ead9baa0

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicGroupQueryInfo.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,6 +35,16 @@ public class MusicGroupQueryInfo extends QueryInfo {
 
     private String searchType;
 
+    private CourseViewTypeEnum courseViewType;
+
+    public CourseViewTypeEnum getCourseViewType() {
+        return courseViewType;
+    }
+
+    public void setCourseViewType(CourseViewTypeEnum courseViewType) {
+        this.courseViewType = courseViewType;
+    }
+
     public String getSearchType() {
         return searchType;
     }

+ 1 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseReviewServiceImpl.java

@@ -588,6 +588,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
                 if (Objects.isNull(existHomework)) {
                     studentCourseHomework.setCourseHomeworkId(courseHomework.getId());
                     studentCourseHomework.setUserId(courseScheduleStudentPayment.getUserId());
+                    studentCourseHomework.setMusicScoreId(musicScoreId);
                     studentCourseHomework.setCourseScheduleId(courseSchedule.getId());
                     studentCourseHomework.setCreateTime(date);
                     studentCourseHomework.setUpdateTime(date);

+ 3 - 0
mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -232,6 +232,9 @@
             <if test="transactionTeacherId!=null">
                 AND transaction_teacher_id_ = #{transactionTeacherId}
             </if>
+            <if test="courseViewType != null">
+                AND course_view_type_ = #{courseViewType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
             <if test="musicGroupIds!=null and musicGroupIds.size()>0">
                 AND id_ IN
                 <foreach collection="musicGroupIds" item="musicGroupId" open="(" close=")" separator=",">