Merge branch 'zx_saas_2022-_0505' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -33,6 +33,9 @@ public class StudentAttendanceViewDto {
     @ApiModelProperty(value = "年级",required = false)
     private Integer currentGradeNum;
 
+    @ApiModelProperty(value = "班级",required = false)
+    private String currentClass;
+
     @ApiModelProperty(value = "学生姓名",required = false)
     private String userName;
 
@@ -53,6 +56,14 @@ public class StudentAttendanceViewDto {
     @ApiModelProperty(value = "是否有待审核的退团申请",required = false)
     private Integer quitFlag;
 
+    public String getCurrentClass() {
+        return currentClass;
+    }
+
+    public void setCurrentClass(String currentClass) {
+        this.currentClass = currentClass;
+    }
+
     public Integer getQuitFlag() {
         return quitFlag;
     }

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

@@ -49,6 +49,10 @@ public class StudentAttendance extends BaseEntity {
 	private Integer currentGradeNum;
 
 	/**  */
+	@ApiModelProperty(value = "班级",required = false)
+	private String currentClass;
+
+	/**  */
 	@ApiModelProperty(value = "学生姓名",required = false)
 	private String username;
 
@@ -100,6 +104,14 @@ public class StudentAttendance extends BaseEntity {
 	@ApiModelProperty(value = "是否达标1是0否")
 	private Integer qualifiedFlag;
 
+	public String getCurrentClass() {
+		return currentClass;
+	}
+
+	public void setCurrentClass(String currentClass) {
+		this.currentClass = currentClass;
+	}
+
 	public Integer getQualifiedFlag() {
 		return qualifiedFlag;
 	}

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

@@ -166,6 +166,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
                 Student student = new Student();
                 student.setUserId(studentAttendance.getUserId());
                 student.setCurrentGradeNum(studentAttendance.getCurrentGradeNum());
+                student.setCurrentClass(studentAttendance.getCurrentClass());
                 student.setTenantId(studentAttendance.getTenantId());
                 students.add(student);
             }

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

@@ -203,6 +203,7 @@
             su.avatar_,
             cssp.be_merged_,
             st.current_grade_num_,
+            st.current_class_,
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_
         FROM
             course_schedule_student_payment cssp

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

@@ -187,6 +187,7 @@
         <result property="subjectId" column="subject_id_"/>
         <result property="subjectName" column="subject_name_"/>
         <result property="currentGradeNum" column="current_grade_num_"/>
+        <result property="currentClass" column="current_class_"/>
         <result property="avatar" column="avatar_"/>
         <result property="phone" column="phone_"/>
         <result property="beMerged" column="be_merged_"/>

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

@@ -254,6 +254,9 @@
                 <if test="item.currentGradeNum != null">
                     current_grade_num_=#{item.currentGradeNum},
                 </if>
+                <if test="item.currentClass != null and item.currentClass != ''">
+                    current_class_ = #{item.currentClass},
+                </if>
                 <if test="item.serviceTag != null">
                     service_tag_ = #{item.serviceTag},
                 </if>