merge

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentCourseScheduleRecordDto.java

@@ -64,6 +64,15 @@ public class StudentCourseScheduleRecordDto {
     @ApiModelProperty(value = "是否达标1是0否")
     private Integer qualifiedFlag = 1;
 
+    @ApiModelProperty(value = "教学内容")
+    private String teachingContent;
+
+    @ApiModelProperty("教学要点")
+    private String teachingPoint;
+
+    @ApiModelProperty("直播课回放记录")
+    private Boolean hasVideoRecord;
+
     public Integer getQualifiedFlag() {
         return qualifiedFlag;
     }
@@ -191,4 +200,28 @@ public class StudentCourseScheduleRecordDto {
 	public void setTeachingAddress(String teachingAddress) {
 		this.teachingAddress = teachingAddress;
 	}
+
+    public String getTeachingContent() {
+        return teachingContent;
+    }
+
+    public void setTeachingContent(String teachingContent) {
+        this.teachingContent = teachingContent;
+    }
+
+    public String getTeachingPoint() {
+        return teachingPoint;
+    }
+
+    public void setTeachingPoint(String teachingPoint) {
+        this.teachingPoint = teachingPoint;
+    }
+
+    public Boolean getHasVideoRecord() {
+        return hasVideoRecord;
+    }
+
+    public void setHasVideoRecord(Boolean hasVideoRecord) {
+        this.hasVideoRecord = hasVideoRecord;
+    }
 }

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

@@ -117,6 +117,8 @@
         <result column="class_group_id_" property="classGroupId"/>
         <result column="school_name_" property="teachingAddress" />
         <result column="qualified_flag_" property="qualifiedFlag" />
+        <result column="teaching_content_" property="teachingContent" />
+        <result column="teaching_point_" property="teachingPoint" />
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.StudentCourseInfoDto" id="StudentCourseInfoDto">
@@ -1157,6 +1159,8 @@
         CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
         cs.actual_teacher_id_ teacher_id_,
         cs.teach_mode_,
+        cs.teaching_content_,
+        cs.teaching_point_,
         s.name_ school_name_,
         sa.qualified_flag_
         FROM course_schedule_student_payment cssp

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -50,8 +51,10 @@ public class TeacherDefaultVipGroupSalaryController extends BaseController {
 
         PageInfo<TeacherDefaultVipGroupSalary> salaryPageInfo = teacherDefaultVipGroupSalaryService.queryPage(queryInfo);
 
+        List<String> groupTypes = Arrays.stream(groupType.split(",")).collect(Collectors.toList());
+
         List<TeacherDefaultVipGroupSalary> collect = salaryPageInfo.getRows().stream()
-                .filter(x -> x.getGroupType().equals(groupType)).collect(Collectors.toList());
+                .filter(x -> groupTypes.contains(x.getGroupType())).collect(Collectors.toList());
         // 重置过滤后的数据
         salaryPageInfo.setRows(collect);
 

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

@@ -18,6 +18,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -67,9 +68,10 @@ public class VipGroupCategoryController extends BaseController {
 	@PreAuthorize("@pcs.hasPermissions('vipGroupCategory/findTeacherDefaultSalary')")
 	public Object findTeacherDefaultSalary(Integer userId, @RequestParam(defaultValue = "VIP") String groupType) {
 
+		List<String> groupTypes = Arrays.stream(groupType.split(",")).collect(Collectors.toList());
 		// 返回LIVE, VIP课薪资设置
 		List<VipGroupCategory> teacherSalary = vipGroupCategoryService.findTeacherSalary(userId).stream()
-				.filter(x -> x.getGroupType().equals(groupType)).collect(Collectors.toList());
+				.filter(x -> groupTypes.contains(x.getGroupType())).collect(Collectors.toList());
 		
 		return succeed(teacherSalary);
 	}