Merge remote-tracking branch 'origin/saas' into saas

audio-analysis/src/main/java/com/yonge/netty/dto/UserChannelContext.java

@@ -764,6 +764,10 @@ public class UserChannelContext {
 			totalTimes = totalTimes + entry.getValue();
 		}
 		
+		if(totalTimes == 0){
+			totalTimes = chunkList.size();
+		}
+		
 		if (maxTimes / totalTimes < hardLevel.getIntegrityRange()) {
 			tempo = false;
 			LOGGER.debug("节奏错误原因：不是同一个音");

audio-analysis/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.yonge.audio" level="dev" />
+	<logger name="com.yonge" level="dev" />
 
 	<!--开发环境:打印控制台 -->
 	<springProfile name="dev">

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.enums.GradeTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.enums.UserGenderEnum;
+
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -118,7 +119,9 @@ public class StudentManageListDto {
     private Boolean hasNoStartCloudTeacher = false;
 
     private Integer recordUserId;
-
+	
+	private String extSubjectIds;
+	
     public Integer getRecordUserId() {
         return recordUserId;
     }
@@ -492,4 +495,12 @@ public class StudentManageListDto {
 	public void setMembershipEndTime(Date membershipEndTime) {
 		this.membershipEndTime = membershipEndTime;
 	}
+
+	public String getExtSubjectIds() {
+		return extSubjectIds;
+	}
+
+	public void setExtSubjectIds(String extSubjectIds) {
+		this.extSubjectIds = extSubjectIds;
+	}
 }

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

@@ -1,10 +1,14 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.auth.api.entity.SysUser;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.ym.mec.auth.api.entity.SysUser;
 
 /**
  * 对应数据库表(student):
@@ -76,6 +80,10 @@ public class Student extends SysUser {
 	private String activityCourseDetail;
 
 	private Integer countFlag;
+	
+	private String extSubjectIds;
+	
+	private Map<Integer,String> extSjectNamesMap = new HashMap<Integer, String>();
 
 	@ApiModelProperty(value = "家长姓名")
 	private String parentName;
@@ -316,4 +324,20 @@ public class Student extends SysUser {
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
+
+	public String getExtSubjectIds() {
+		return extSubjectIds;
+	}
+
+	public void setExtSubjectIds(String extSubjectIds) {
+		this.extSubjectIds = extSubjectIds;
+	}
+
+	public Map<Integer, String> getExtSjectNamesMap() {
+		return extSjectNamesMap;
+	}
+
+	public void setExtSjectNamesMap(Map<Integer, String> extSjectNamesMap) {
+		this.extSjectNamesMap = extSjectNamesMap;
+	}
 }

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

@@ -126,9 +126,11 @@ public class PayServiceImpl implements PayService {
 	        		throw new BizException("平台收款账户查询失败");
 	        	}
 	        	
+	        	Integer routeOrganId = 68;
+	        	
 	        	StudentPaymentRouteOrder studentPaymentRouteOrder = new StudentPaymentRouteOrder();
 	            studentPaymentRouteOrder.setOrderNo(orderNo);
-	            studentPaymentRouteOrder.setRouteOrganId(organId);
+	            studentPaymentRouteOrder.setRouteOrganId(routeOrganId);
 	            studentPaymentRouteOrder.setFeeFlag("Y");
 	            studentPaymentRouteOrder.setRouteAmount(amount);
 	            studentPaymentRouteOrder.setRouteBalanceAmount(balanceAmount);

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

@@ -78,6 +78,7 @@
         <result column="experience_membership_day_" property="experienceMembershipDay"/>
         <result column="experience_membership_end_time_" property="experienceMembershipEndTime"/>
         <result column="record_user_id_" property="recordUserId"/>
+        <result column="ext_subject_ids_" property="extSubjectIds"/>
     </resultMap>
 
     <update id="updateUser" parameterType="com.ym.mec.auth.api.entity.SysUser">
@@ -145,7 +146,7 @@
     </update>
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
-        SELECT o.`name_` organ_name_,o.grade_type_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,
+        SELECT o.`name_` organ_name_,o.grade_type_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,s.ext_subject_ids_,
         sut.name_ real_name_,su.`gender_` , su.organ_id_,
 		tu.`real_name_` teacher_name_,CASE s.service_tag_ WHEN 2 THEN 0 ELSE s.service_tag_ END service_tag_ ,s.`operating_tag_` ,
         s.care_package_, s.come_on_package_, suca.`course_balance_` ,suca.balance_,

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

@@ -35,6 +35,7 @@
         <result column="phone_" property="phone"/>
         <result column="username_" property="username"/>
         <result column="count_flag_" property="countFlag"/>
+        <result column="ext_subject_ids_" property="extSubjectIds"/>
         <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
@@ -88,7 +89,7 @@
         </if>
         teacher_id_,create_time_,update_time_,service_tag_update_time_,cooperation_organ_id_,
         care_package_,come_on_package_,member_rank_setting_id_,membership_start_time_,
-        membership_end_time_,current_grade_num_,current_class_,tenant_id_)
+        membership_end_time_,current_grade_num_,current_class_,ext_subject_ids_,tenant_id_)
         VALUES
         (#{userId},#{schoolName},#{subjectIdList},
         <if test="serviceTag != null">
@@ -99,7 +100,7 @@
         </if>
         #{teacherId},NOW(),NOW(),NOW(),#{cooperationOrganId},
          #{carePackage},#{comeOnPackage},#{memberRankSettingId},#{membershipStartTime},
-         #{membershipEndTime},#{currentGradeNum},#{currentClass},#{tenantId})
+         #{membershipEndTime},#{currentGradeNum},#{currentClass},#{extSubjectIds},#{tenantId})
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Student">
@@ -160,6 +161,9 @@
             <if test="activityCourseDetail != null">
                 activity_course_detail_=#{activityCourseDetail},
             </if>
+            <if test="extSubjectIds != null">
+                ext_subject_ids_=#{extSubjectIds},
+            </if>
                 cooperation_organ_id_=#{cooperationOrganId},
                 update_time_ = NOW()
         </set>
@@ -286,6 +290,9 @@
 	            <if test="item.membershipEndTime != null">
 	                membership_end_time_=#{item.membershipEndTime},
 	            </if>
+	            <if test="item.extSubjectIds != null">
+	                ext_subject_ids_=#{item.extSubjectIds},
+	            </if>
                 update_time_ = NOW()
             </set>
             WHERE user_id_ = #{item.userId} and tenant_id_ = #{item.tenantId}

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

@@ -159,6 +159,12 @@ public class StudentManageController extends BaseController {
 			List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getSubjectIdList());
 			student.setSubjectNames(subjectList.stream().map(t -> t.getName()).collect(Collectors.joining(",")));
 		}
+		
+		if(StringUtils.isNotBlank(student.getExtSubjectIds())){
+			List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getExtSubjectIds());
+			
+			student.setExtSjectNamesMap(subjectList.stream().collect(Collectors.toMap(Subject :: getId, Subject :: getName)));
+		}
 
 		Map<String, Object> datas = new HashMap<String, Object>();
 		datas.put("student", student);

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

@@ -316,12 +316,12 @@ public class StudentRegistrationController extends BaseController {
         try {
             HSSFWorkbook workbook = null;
             if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE)) {
-                String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级班级", "选报声部1", "选报声部2","老师推荐专业","选报专业", "是否服从调剂", "乐器准备方式", "练习系统"};
-                String[] body = {"userId", "userName", "gender == 1 ? '男' : '女'", "phone", "currentGrade", "subjectFirstName", "subjectSecondName","teacherRecommandSubjectName","selectionSubjectName", "isAllowAdjust ? '是' : '否'", "kitPurchaseMethod", "cloudTeacherMethod"};
+                String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级班级", "选报声部1", "选报声部2","老师推荐专业","选报专业", "乐器准备方式", "练习系统"};
+                String[] body = {"userId", "userName", "gender == 1 ? '男' : '女'", "phone", "currentGrade", "subjectFirstName", "subjectSecondName","teacherRecommandSubjectName","selectionSubjectName", "kitPurchaseMethod", "cloudTeacherMethod"};
                 workbook = POIUtil.exportExcel(header, body, studentPreRegistration.getRows());
             } else {
-                String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级班级", "选报声部1", "选报声部2","老师推荐专业","选报专业", "是否服从调剂", "乐器准备方式", "练习系统"};
-                String[] body = {"userId", "userName", "gender == 1 ? '男' : '女'", "phone", "currentGrade", "subjectFirstName", "subjectSecondName","teacherRecommandSubjectName","selectionSubjectName", "isAllowAdjust ? '是' : '否'", "kitPurchaseMethod", "cloudTeacherMethod"};
+                String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级班级", "选报声部1", "选报声部2","老师推荐专业","选报专业", "乐器准备方式", "练习系统"};
+                String[] body = {"userId", "userName", "gender == 1 ? '男' : '女'", "phone", "currentGrade", "subjectFirstName", "subjectSecondName","teacherRecommandSubjectName","selectionSubjectName", "kitPurchaseMethod", "cloudTeacherMethod"};
                 workbook = POIUtil.exportExcel(header, body, studentPreRegistration.getRows());
             }