yonge 3 年 前
コミット
160658ee08

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

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

@@ -78,6 +78,7 @@
         <result column="experience_membership_day_" property="experienceMembershipDay"/>
         <result column="experience_membership_day_" property="experienceMembershipDay"/>
         <result column="experience_membership_end_time_" property="experienceMembershipEndTime"/>
         <result column="experience_membership_end_time_" property="experienceMembershipEndTime"/>
         <result column="record_user_id_" property="recordUserId"/>
         <result column="record_user_id_" property="recordUserId"/>
+        <result column="ext_subject_ids_" property="extSubjectIds"/>
     </resultMap>
     </resultMap>
 
 
     <update id="updateUser" parameterType="com.ym.mec.auth.api.entity.SysUser">
     <update id="updateUser" parameterType="com.ym.mec.auth.api.entity.SysUser">
@@ -145,7 +146,7 @@
     </update>
     </update>
 
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
     <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_,
         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_` ,
 		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_,
         s.care_package_, s.come_on_package_, suca.`course_balance_` ,suca.balance_,