Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -24,6 +25,14 @@ public class MusicGroupPaymentCalender {
 		this.chargeTypeId = chargeTypeId;
 	}
 
+	public CourseViewTypeEnum getCourseViewType() {
+		return courseViewType;
+	}
+
+	public void setCourseViewType(CourseViewTypeEnum courseViewType) {
+		this.courseViewType = courseViewType;
+	}
+
 	public enum PaymentCalenderStatusEnum implements BaseEnum<String, PaymentCalenderStatusEnum> {
 		AUDITING("审核中"), REJECT("拒绝"), NO("未开启缴费"), OPEN("开启缴费"), OVER("缴费已结束"), PAID("已缴费");
 
@@ -151,6 +160,9 @@ public class MusicGroupPaymentCalender {
 	@ApiModelProperty(value = "chargeTypeId", required = false)
 	private Integer chargeTypeId;
 
+	@ApiModelProperty(value = "课程展现形式",required = false)
+	private CourseViewTypeEnum courseViewType;
+
 	public String getAuditMemo() {
 		return auditMemo;
 	}

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

@@ -119,23 +119,19 @@
 		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
-		<where>
-			sesa.del_flag_ = 0
-			<if test="subjectId != null">
-				AND sesa.subject_id_ = #{subjectId}
-			</if>
-			<if test="sysMusicScoreId != null">
-				AND sesa.exam_song_id_ = #{sysMusicScoreId}
-			</if>
-		</where>
+		<include refid="queryPageSql"/>
 		ORDER BY sesa.id_ DESC
 		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_music_score_accompaniment
+		SELECT COUNT(sesa.id_) FROM sys_music_score_accompaniment
+		FROM sys_music_score_accompaniment sesa
+		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		<include refid="queryPageSql"/>
 	</select>
+
 	<select id="findSubjectByMusicScoreId" resultType="java.lang.Integer">
 		SELECT subject_id_ FROM sys_music_score_accompaniment
 		<where>

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -1,5 +1,8 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.entity.Student;
+import com.ym.mec.biz.dal.entity.Teacher;
+import com.ym.mec.biz.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -10,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,15 +26,6 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.CashAccountDetail;
 import com.ym.mec.biz.dal.entity.SysSuggestion;
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.ImGroupNoticeService;
-import com.ym.mec.biz.service.StudentManageService;
-import com.ym.mec.biz.service.SubjectService;
-import com.ym.mec.biz.service.SysSuggestionService;
-import com.ym.mec.biz.service.SysUserBankCardService;
-import com.ym.mec.biz.service.SysUserCashAccountDetailService;
-import com.ym.mec.biz.service.SysUserCashAccountService;
-import com.ym.mec.biz.service.UploadFileService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.common.filters.TenantIdThreadLocal;
@@ -59,6 +54,8 @@ public class StudentManageController extends BaseController {
     private StudentManageService studentManageService;
     @Autowired
     private SubjectService subjectService;
+    @Autowired
+    private StudentService studentService;
 
     private final static Logger LOGGER = LoggerFactory.getLogger(StudentManageController.class);
 
@@ -94,6 +91,18 @@ public class StudentManageController extends BaseController {
         return succeed();
     }
 
+
+    @ApiOperation(value = "获取学员基本信息")
+    @GetMapping("student/queryUserInfo")
+    public Object queryUserInfo() {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        Student student = studentService.get(user.getId());
+        return succeed(student);
+    }
+
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("classGroup/findGroupUsers")
     public Object findGroupUsers(Integer groupId,String search) {

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -795,6 +795,7 @@ public class StudentOrderController extends BaseController {
             musicGroupRegCalender.setChargeTypeId(musicGroup.getChargeTypeId());
             List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(musicGroupId);
             musicGroupRegCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettings);
+            musicGroupRegCalender.setCourseViewType(musicGroup.getCourseViewType());
         }
         return succeed(musicGroupRegCalender);
     }

mec-student/src/main/java/com/ym/mec/student/controller/SysMusicScoreAccompanimentController.java

@@ -22,4 +22,11 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         queryInfo.setType("COMMON");
         return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
     }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPageLimit")
+    public Object queryPageLimit(SysExamSongQueryInfo queryInfo) {
+        queryInfo.setType("COMMON");
+        return succeed(sysMusicScoreAccompanimentService.queryPage(queryInfo));
+    }
 }

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

@@ -51,4 +51,11 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         queryInfo.setCreateUserId(sysUser.getId());
         return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
     }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPageLimit")
+    public Object queryPageLimit(SysExamSongQueryInfo queryInfo) {
+        queryInfo.setType("COMMON");
+        return succeed(sysMusicScoreAccompanimentService.queryPage(queryInfo));
+    }
 }