zouxuan 2 роки тому
батько
коміт
6618661e4b

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

@@ -125,6 +125,16 @@ public class StudentManageListDto {
 	
 	private String extSubjectIds;
 
+	private Boolean repairFlag;
+
+    public Boolean getRepairFlag() {
+        return repairFlag;
+    }
+
+    public void setRepairFlag(Boolean repairFlag) {
+        this.repairFlag = repairFlag;
+    }
+
     public String getAvatar() {
         return avatar;
     }

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentManageQueryInfo.java

@@ -55,6 +55,16 @@ public class StudentManageQueryInfo extends QueryInfo {
     //是否使用过云教练
     private Integer isRecord;
 
+    private Boolean repairFlag;
+
+    public Boolean getRepairFlag() {
+        return repairFlag;
+    }
+
+    public void setRepairFlag(Boolean repairFlag) {
+        this.repairFlag = repairFlag;
+    }
+
     public Integer getIsRecord() {
         return isRecord;
     }

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

@@ -80,6 +80,7 @@
         <result column="experience_membership_end_time_" property="experienceMembershipEndTime"/>
         <result column="record_user_id_" property="recordUserId"/>
         <result column="ext_subject_ids_" property="extSubjectIds"/>
+        <result column="repair_flag_" property="repairFlag"/>
     </resultMap>
 
     <update id="updateUser" parameterType="com.ym.mec.auth.api.entity.SysUser">
@@ -147,7 +148,7 @@
     </update>
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
-        SELECT o.`name_` organ_name_,o.grade_type_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,s.ext_subject_ids_,
+        SELECT o.`name_` organ_name_,o.grade_type_,s.`user_id_`,s.repair_flag_ ,su.`username_` ,su.`phone_` parents_phone_,s.ext_subject_ids_,
         sut.name_ real_name_,su.`gender_` , su.organ_id_,su.avatar_,
 		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_,
@@ -198,6 +199,9 @@
             <if test="isActive != null and isActive == true">
                 AND su.password_ is not null
             </if>
+            <if test="repairFlag != null">
+                AND s.repair_flag_ = #{repairFlag}
+            </if>
             <if test="isActive != null and isActive == false">
                 AND su.password_ is null
             </if>

+ 0 - 1
mec-web/src/main/java/com/ym/mec/web/controller/education/EduStudentStudentController.java

@@ -118,5 +118,4 @@ public class EduStudentStudentController extends BaseController {
         queryInfo.setIsExport(false);
         return succeed(studentManageService.findStudentsByOrganId(queryInfo));
     }
-
 }