Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleComplaintsDao.java

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Collection;
 import java.util.List;
 
 public interface CourseScheduleComplaintsDao extends BaseDAO<Long, CourseScheduleComplaints> {
@@ -67,7 +68,7 @@ public interface CourseScheduleComplaintsDao extends BaseDAO<Long, CourseSchedul
      * 删除申述
      * @param courseScheduleIds
      */
-    void delByCourseScheduleIds(@Param("courseScheduleIds") List<Long> courseScheduleIds);
+    void delByCourseScheduleIds(@Param("courseScheduleIds") Collection<Long> courseScheduleIds);
 
     /**
      * 获取课程用户的评价

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherAttendanceDao.java

@@ -6,10 +6,7 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
 
@@ -186,6 +183,18 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
     void batchUpdateTeacher(@Param("courseScheduleIds") Set<Long> courseScheduleIds, @Param("teacherId") Integer teacherId);
 
 	/**
+	 * 清除考勤申述
+	 * @param courseScheduleIds
+	 */
+    void clearAttendanceComplaints(@Param("courseScheduleIds") Collection<Long> courseScheduleIds);
+
+	/**
+	 * 清除考勤申述
+	 * @param courseScheduleId
+	 */
+    void clearAttendanceComplaint(@Param("courseScheduleId") Long courseScheduleId);
+
+	/**
 	 * @describe 根据团体删除班级
 	 * @author Joburgess
 	 * @date 2020/2/17
@@ -232,13 +241,6 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
 	int countTeacherAttendanceComplaints(Map<String, Object> params);
 
 	/**
-	 * 删除老师考勤
-	 * @param courseScheduleIds
-	 * @param teacherId
-	 */
-	void deleteByCourseAndTeacherId(@Param("courseScheduleIds") Set<Long> courseScheduleIds, @Param("teacherId") Integer teacherId);
-
-	/**
 	 * 获取上课时间
 	 * @param courseScheduleId
 	 * @return

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

@@ -11,6 +11,9 @@ public class MusicGroupCourseScheduleDto {
 
     @ApiModelProperty(value = "课程编号")
     private Integer courseScheduleId;
+    
+    @ApiModelProperty(value = "课程名称")
+    private String courseScheduleName;
 
     @ApiModelProperty(value = "上课日期",required = false)
     private String classDate;
@@ -262,4 +265,12 @@ public class MusicGroupCourseScheduleDto {
         this.masterTeacherName = masterTeacherName;
     }
 
+	public String getCourseScheduleName() {
+		return courseScheduleName;
+	}
+
+	public void setCourseScheduleName(String courseScheduleName) {
+		this.courseScheduleName = courseScheduleName;
+	}
+
 }

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

@@ -1,6 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.biz.dal.enums.PaymentFlagEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -41,7 +41,7 @@ public class MusicGroupStudentsDto{
     @ApiModelProperty(value = "学员状态 NORMAL(NORMAL, 在读), LEAVE(LEAVE, 请假), QUIT(QUIT, 退班)",required = false)
     private String studentStatus;
 
-    private PaymentStatusEnum paymentStatus;
+    private PaymentFlagEnum paymentStatus;
 
     @ApiModelProperty(value = "是否新增学员（1是0否）",required = false)
     private Integer isNewStudent;
@@ -170,11 +170,11 @@ public class MusicGroupStudentsDto{
         this.studentStatus = studentStatus;
     }
 
-    public PaymentStatusEnum getPaymentStatus() {
+    public PaymentFlagEnum getPaymentStatus() {
         return paymentStatus;
     }
 
-    public void setPaymentStatus(PaymentStatusEnum paymentStatus) {
+    public void setPaymentStatus(PaymentFlagEnum paymentStatus) {
         this.paymentStatus = paymentStatus;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/PaymentFlagEnum.java

@@ -0,0 +1,27 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum PaymentFlagEnum implements BaseEnum<Integer, PaymentFlagEnum> {
+	NO(0,"未缴费"),
+	OPEN(1,"已缴费");
+
+	private Integer code;
+
+	private String desc;
+
+	PaymentFlagEnum(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	@Override
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java

@@ -175,7 +175,6 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @param teacherId: 要计算课酬的老师的编号
      * @param onlineClassesUnitPrice: 线上课程单价
      * @param offlineClassesUnitPrice: 线下课程单价
-     * @param computeTotalPrice: 是否计算课程购买总价
      * @return java.util.Map
      */
     <K extends VipGroup> Map<String, BigDecimal> countVipGroupPredictFee(K vipGroup,

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

@@ -2133,6 +2133,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		courseScheduleReviewDao.delByCourseScheduleIds(courseScheduleIds);
 		//删除申述
 		courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleIds);
+		//清除考勤申述
+		teacherAttendanceDao.clearAttendanceComplaints(courseScheduleIds);
 //        vipGroupService.checkVipCourseIsInScore(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
 //        courseScheduleStudentPaymentService.updateVipGiveCourse(vipGroup.getId());
         if(scheduleModifyLogs.size() == courseSchedules.size()){
@@ -2590,8 +2592,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			int newMinutes = DateUtil.minutesBetween(newCourseSchedule.getStartClassTime(), newCourseSchedule.getEndClassTime());
 
 			// 如果修改了老师、课程类型、课程时长、教学模式，需要修改课酬
-//			if (!ListUtil.isEquals(oldTeacherIdList, newTeacherIdList) || newCourseSchedule.getType() != oldCourseSchedule.getType()
-//					|| newCourseSchedule.getTeachMode() != oldCourseSchedule.getTeachMode() || oldMinutes != newMinutes) {
+			if (VIP.equals(newCourseSchedule.getGroupType())||!ListUtil.isEquals(oldTeacherIdList, newTeacherIdList) || newCourseSchedule.getType() != oldCourseSchedule.getType()
+					|| newCourseSchedule.getTeachMode() != oldCourseSchedule.getTeachMode() || oldMinutes != newMinutes) {
 
 				Map<Integer, Teacher> teacherMap = null;
 				Map<Integer, Map<CourseScheduleType, TeacherDefaultMusicGroupSalary>> musicGroupSalaryMap = new HashMap<Integer, Map<CourseScheduleType, TeacherDefaultMusicGroupSalary>>();
@@ -2752,7 +2754,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					}
 					insertCourseScheduleTeacherSalaryList.add(ts);
 				}
-//			}
+			}
+
+			//删除申述
+			courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleIds);
 
 			// 调整日志
 			CourseScheduleModifyLog courseScheduleModifyLog = new CourseScheduleModifyLog();
@@ -2896,6 +2901,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             if (newCourseSchedule.getStartClassTime().after(now)){
                 teacherAttendanceDao.cleanCourseTeacherSignInfo(newCourseSchedule.getId());
                 needCreateStudentPaymentCourses.add(oldCourseSchedule);
+                //删除申述
+                courseScheduleComplaintsDao.delByCourseScheduleId(newCourseSchedule.getId());
+                //清除考勤申述
+                teacherAttendanceDao.clearAttendanceComplaint(newCourseSchedule.getId());
             }
 
             boolean courseTimeIsChange = false;
@@ -2907,6 +2916,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
             if(newCourseSchedule.getStartClassTime().after(oldCourseSchedule.getStartClassTime())){
                 teacherAttendanceDao.cleanCourseTeacherSignInfo(newCourseSchedule.getId());
+                //删除申述
+                courseScheduleComplaintsDao.delByCourseScheduleId(newCourseSchedule.getId());
+                //清除考勤申述
+                teacherAttendanceDao.clearAttendanceComplaint(newCourseSchedule.getId());
             }
 
             oldCourseSchedule.setClassDate(newCourseSchedule.getClassDate());
@@ -3858,6 +3871,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		courseScheduleReviewDao.delByCourseScheduleId(courseScheduleId);
 		//删除申述
 		courseScheduleComplaintsDao.delByCourseScheduleId(courseScheduleId);
+		//清除考勤申述
+		teacherAttendanceDao.clearAttendanceComplaint(courseScheduleId);
         courseScheduleDao.update(oldCourseSchedule);
         courseScheduleModifyLogDao.insert(scheduleModifyLog);
 		if(practiceGroup.getType() == TRIAL){
@@ -3933,6 +3948,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 		}
         teacherAttendanceDao.batchUpdateTeacher(courseScheduleIds,teacherId);
+		//删除申述
+		courseScheduleComplaintsDao.delByCourseScheduleId(courseScheduleId);
+		//删除申述
+		courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleIds);
+		//清除考勤申述
+		teacherAttendanceDao.clearAttendanceComplaints(courseScheduleIds);
         courseScheduleModifyLogDao.insert(scheduleModifyLog);
 
         Map<Integer, String> map = new HashMap<>(2);
@@ -4045,6 +4066,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 		}
         teacherAttendanceDao.batchUpdateTeacher(courseScheduleIds,teacherId);
+		//删除申述
+		courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleIds);
+		//清除考勤申述
+		teacherAttendanceDao.clearAttendanceComplaints(courseScheduleIds);
         courseScheduleModifyLogDao.batchInsert(scheduleModifyLogs);
 
         if (teacherIdMap != null && teacherIdMap.size() > 0) {
@@ -4078,6 +4103,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
         teacherAttendanceDao.batchCleanCourseTeacherSignInfo(courseScheduleId);
         studentAttendanceDao.deleteByCourseSchedules(courseScheduleId);
+		//删除申述
+		courseScheduleComplaintsDao.delByCourseScheduleIds(courseScheduleId);
+		//清除考勤申述
+		teacherAttendanceDao.clearAttendanceComplaints(courseScheduleId);
         //重置学生人数
 		courseScheduleDao.resetStudentNum(courseScheduleId);
     }

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

@@ -1006,8 +1006,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			throw new BizException("指定的活动方案不存在");
 		}
 
-		Teacher teacher = teacherDao.get(teacherId);
-
 		VipGroupSalarySettlementDto vipGroupSalarySettlementDto = JSON.parseObject(vipGroupActivity.getSalarySettlementJson(), VipGroupSalarySettlementDto.class);
 
 		if(Objects.isNull(vipGroupSalarySettlementDto)){
@@ -1121,10 +1119,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		//教师线下单课酬计算
 		if(Objects.nonNull(vipGroupSalarySettlementDto.getOfflineSalarySettlement())){
-			if(vipGroup instanceof VipGroupApplyBaseInfoDto){
-				teacherOfflineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOfflineTeacherSalary();
-				results.put("offlineTeacherSalary",teacherOfflineSalary);
-			}
 			if(Objects.isNull(teacherOfflineSalary)){
 				switch (vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSalarySettlementType()){
 					case TEACHER_DEFAULT:
@@ -1149,7 +1143,19 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		}
 
 		BigDecimal ots = results.get("onlineTeacherSalary");
+		if(Objects.isNull(ots)){
+			ots = teacherDefaultVipGroupSalary.getOnlineClassesSalary();
+		}
+		if(Objects.isNull(ots)){
+			ots = BigDecimal.ZERO;
+		}
 		BigDecimal ofts = results.get("offlineTeacherSalary");
+		if(Objects.isNull(ofts)){
+			ofts = teacherDefaultVipGroupSalary.getOfflineClassesSalary();
+		}
+		if(Objects.isNull(ofts)){
+			ofts = BigDecimal.ZERO;
+		}
 		if(Objects.nonNull(vipGroup.getStatus())&&normalStudentNum!=vipGroupCategory.getStudentNum()){
 			ots = ots.divide(new BigDecimal(vipGroupCategory.getStudentNum()),CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(normalStudentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
 			ofts = ofts.divide(new BigDecimal(vipGroupCategory.getStudentNum()),CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(normalStudentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);

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

@@ -754,6 +754,7 @@
         <result property="signOutStatus" column="sign_out_status_"/>
         <result property="settlementTime" column="settlement_time_"/>
         <result property="remark" column="remark_"/>
+        <result property="courseScheduleName" column="course_schedule_name_"/>
     </resultMap>
     <select id="queryMusicGroupCourseSchedule" resultMap="MusicGroupCourseScheduleDto">
         SELECT cs.id_ course_schedule_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.class_group_id_,
@@ -773,7 +774,7 @@
     </select>
 
     <select id="queryMusicGroupCourseScheduleDetail" resultMap="MusicGroupCourseScheduleDto">
-        SELECT cs.id_ course_schedule_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.class_group_id_,
+        SELECT cs.id_ course_schedule_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.class_group_id_,cs.name_ course_schedule_name_,
         cs.type_ course_schedule_type_,cs.status_ course_schedule_status_,cg.name_ course_schedule_name_,
         IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
         IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,

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

@@ -150,8 +150,8 @@
 
     <update id="updateEducationTeacherId">
         UPDATE music_group SET educational_teacher_id_ = #{targetUserId} WHERE educational_teacher_id_ = #{currentUserId} AND status_ != 'CANCELED';
-        UPDATE vip_group SET educational_teacher_id_ = #{targetUserId} WHERE educational_teacher_id_ = #{currentUserId} AND group_status_ IN (0,1,5,2,6);
-        UPDATE practice_group SET educational_teacher_id_ = #{targetUserId} WHERE educational_teacher_id_ = #{currentUserId} AND group_status_ NOT IN ('FINISH');
+        UPDATE vip_group SET educational_teacher_id_ = #{targetUserId} WHERE educational_teacher_id_ = #{currentUserId} AND group_status_ IN (0,1,5,2,6,4);
+        UPDATE practice_group SET educational_teacher_id_ = #{targetUserId} WHERE educational_teacher_id_ = #{currentUserId} AND group_status_ != 'CANCEL';
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -260,7 +260,7 @@
             LEFT JOIN sys_user_role sur ON su.id_ = sur.user_id_
             LEFT JOIN employee e ON e.user_id_ = su.id_
         WHERE
-            FIND_IN_SET(sur.role_id_, #{roleIds})
+            su.lock_flag_ = 0 AND su.del_flag_ = 0 AND FIND_IN_SET(sur.role_id_, #{roleIds})
             <if test="organIds!=null and organIds!=''">
                 AND INTE_ARRAY(e.organ_id_list_,#{organIds})
             </if>
@@ -275,11 +275,11 @@
     </select>
     <select id="hasCourseGroupRelation" resultType="java.lang.Integer">
         SELECT SUM(a.num) FROM
-        (SELECT COUNT(vg.id_) num FROM vip_group vg WHERE vg.educational_teacher_id_  = #{employeeId} AND vg.group_status_ IN (0,1,5,2,6)
+        (SELECT COUNT(vg.id_) num FROM vip_group vg WHERE vg.educational_teacher_id_  = #{employeeId} AND vg.group_status_ IN (0,1,5,2,6,4)
         UNION ALL
         SELECT COUNT(mg.id_) num FROM music_group mg WHERE mg.educational_teacher_id_ = #{employeeId} AND mg.status_ != 'CANCELED'
         UNION ALL
-        SELECT COUNT(pg.id_) num FROM practice_group pg WHERE pg.educational_teacher_id_ = #{employeeId} AND pg.group_status_ NOT IN ('FINISH'))a
+        SELECT COUNT(pg.id_) num FROM practice_group pg WHERE pg.educational_teacher_id_ = #{employeeId} AND pg.group_status_ != 'CANCEL')a
     </select>
     <select id="hasCourseSchedule" resultType="java.lang.Integer">
         SELECT COUNT(DISTINCT cs.id_)

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

@@ -577,6 +577,19 @@
         SET sign_out_status_ = NULL,sign_out_time_= NULL
     	WHERE course_schedule_id_=#{courseId}
     </update>
+    <update id="clearAttendanceComplaints">
+        UPDATE teacher_attendance
+        SET is_complaints_ = 0,complaints_status_ = NULL,complaints_content_ = NULL,dispose_content_ = NULL,operator_ = NULL,complaints_time_ = NULL
+        WHERE course_schedule_id_ IN
+        <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
+            #{courseScheduleId}
+        </foreach>
+    </update>
+    <update id="clearAttendanceComplaint">
+        UPDATE teacher_attendance
+        SET is_complaints_ = 0,complaints_status_ = NULL,complaints_content_ = NULL,dispose_content_ = NULL,operator_ = NULL,complaints_time_ = NULL
+        WHERE course_schedule_id_ = #{courseScheduleId}
+    </update>
 
     <delete id="deleteByMusicGroupId" parameterType="map" >
 		DELETE ta FROM teacher_attendance ta LEFT JOIN course_schedule cs ON ta.course_schedule_id_ = cs.id_
@@ -589,10 +602,4 @@
     <delete id="deleteByGroup">
         DELETE FROM teacher_attendance WHERE music_group_id_=#{groupId} AND group_type_=#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </delete>
-    <delete id="deleteByCourseAndTeacherId">
-        DELETE FROM teacher_attendance WHERE teacher_id_ = #{teacherId} AND course_schedule_id_ IN
-        <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
-            #{courseScheduleId}
-        </foreach>
-    </delete>
 </mapper>

mec-im/src/main/java/com/ym/config/ResourceServerConfig.java

@@ -10,6 +10,6 @@ import org.springframework.security.oauth2.config.annotation.web.configuration.R
 public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
     @Override
     public void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests().antMatchers("/v2/api-docs","/user/register","/group/join","/group/create","/room/leave","/room/statusSync","/group/batchDismiss","/private/send").permitAll().anyRequest().authenticated().and().csrf().disable();
+        http.authorizeRequests().antMatchers("/v2/api-docs","/user/register","/group/join","/group/create","/room/leave","/room/statusSync","/room/statusImMsg","/group/batchDismiss","/private/send").permitAll().anyRequest().authenticated().and().csrf().disable();
     }
 }

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -79,6 +79,11 @@ public class RoomController{
         return new BaseResponse<>(result);
     }
 
+    @RequestMapping(value = "/statusImMsg")
+    public void statusImMsg(@RequestBody String body) throws Exception {
+        System.out.println("");
+    }
+
     @RequestMapping(value = "/downgrade", method = RequestMethod.POST)
     public Object downRole(@RequestBody ReqChangeUserRoleData data)
             throws ApiException, Exception {

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

@@ -152,16 +152,21 @@ public class EmployeeController extends BaseController {
 
     @ApiOperation(value = "获取教务人员")
     @GetMapping("/findEducationUsers")
-    public HttpResponseResult findEducationUsers(){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        String organIds=new String();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
+    public HttpResponseResult findEducationUsers(Integer userId){
+        SysUser sysUser;
+        if(userId == null){
+            sysUser = sysUserFeignService.queryUserInfo();
+            if (sysUser == null) {
+                return failed("用户信息获取失败");
+            }
+        }else {
+            sysUser = sysUserFeignService.queryUserById(userId);
         }
+        String organIds = new String();
         if (!sysUser.getIsSuperAdmin()) {
             Employee employee = employeeService.get(sysUser.getId());
             if (StringUtils.isEmpty(organIds)) {
-                organIds=employee.getOrganIdList();
+                organIds = employee.getOrganIdList();
             }
         }
         return succeed(employeeService.findByRole("4,5",organIds));

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

@@ -972,7 +972,7 @@ public class ExportController extends BaseController {
                 }
             }
             String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级", "班级", "专业", "学员状态", "新增学员", "缴费金额",
-                    "下次缴费日期", "报名缴费", "是否激活"};
+                    "下次缴费日期", "是否报名缴费", "是否激活"};
             String[] body = {"userId", "realName", "gender", "phone", "currentGrade", "currentClass", "subjectName", "studentStatus", "isNewStudentStr",
                     "courseFee", "nextPaymentDateStr", "paymentStatus.desc", "activeName"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, musicGroupStudentsDtoPageInfo.getRows());