Merge remote-tracking branch 'origin/master'

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

@@ -58,6 +58,10 @@ public class StudentManageListDto {
 
     private Integer organId;
 
+    private YesOrNoEnum serviceTag;
+
+    private YesOrNoEnum operatingTag;
+
     private String organName;
 
     private String subjectName;
@@ -68,6 +72,22 @@ public class StudentManageListDto {
 
     private String vipGroupStatus;
 
+    public YesOrNoEnum getServiceTag() {
+        return serviceTag;
+    }
+
+    public void setServiceTag(YesOrNoEnum serviceTag) {
+        this.serviceTag = serviceTag;
+    }
+
+    public YesOrNoEnum getOperatingTag() {
+        return operatingTag;
+    }
+
+    public void setOperatingTag(YesOrNoEnum operatingTag) {
+        this.operatingTag = operatingTag;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

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

@@ -29,7 +29,7 @@ public class ExtracurricularExercisesMessage {
 	/** 父级编号 */
 	private Long parentId;
 
-	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT_MSG;
+	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT;
 
 	public ImSendTypeEnum getMsgType() {
 		return msgType;

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

@@ -34,7 +34,7 @@ public class StudentCourseHomeworkReply {
 	private boolean extra;
 
 	//false  文本，true其他需要跳转
-	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT_MSG;
+	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT;
 
 	public ImSendTypeEnum getMsgType() {
 		return msgType;

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

@@ -6,10 +6,10 @@ import com.ym.mec.common.enums.BaseEnum;
  * 融云消息类型
  */
 public enum ImSendTypeEnum implements BaseEnum<String, ImSendTypeEnum> {
-	TXT_MSG("txt", "文本"),
-	IMG_MSG("img", "图片"),
-	VC_MSG("vc", "语言"),
-	FILE_MSG("file", "文件");
+	TXT("TXT", "文本"),
+	IMG("IMG", "图片"),
+	VC("VC", "语言"),
+	FILE("FILE", "文件");
 
 	private String code;
 

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

@@ -86,7 +86,7 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 			userMap.put(extracurricularExercisesReply.getUserId(),extracurricularExercisesReply.getUserId().toString());
 			String notifyUrl = "3?courseScheduleID=" + extracurricularExercisesReply.getId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1";
 			String extra = "";
-			if (extracurricularExercisesMessage.getMsgType() != ImSendTypeEnum.TXT_MSG){
+			if (extracurricularExercisesMessage.getMsgType() != ImSendTypeEnum.TXT){
 				extra = "dayaedu?courseScheduleID=" + extracurricularExercisesReply.getId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1&" + "userId=" + extracurricularExercisesReply.getUserId();
 				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_TEACHER_REPLY_IM,extracurricularExercises.getTeacherId().toString(),extra,
 						new String[]{extracurricularExercisesReply.getUserId().toString()},
@@ -106,7 +106,7 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 			String notifyUrl = "9?courseScheduleID=" + extracurricularExercisesReply.getId() +
 					"&userId=" + extracurricularExercisesReply.getUserId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1";
 			String extra = "";
-			if (extracurricularExercisesMessage.getMsgType() != ImSendTypeEnum.TXT_MSG){
+			if (extracurricularExercisesMessage.getMsgType() != ImSendTypeEnum.TXT){
 				extra = "dayaedu?courseScheduleID=" + extracurricularExercisesReply.getId() + "&userId=" + extracurricularExercisesReply.getUserId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1";
 				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_STUDENT_REPLY_IM,extracurricularExercisesReply.getUserId().toString(),extra,
 						new String[]{extracurricularExercises.getTeacherId().toString()},

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

@@ -67,7 +67,7 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 				"&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
 		String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
 		String extra = "";
-		if (bean.getMsgType() != ImSendTypeEnum.TXT_MSG){
+		if (bean.getMsgType() != ImSendTypeEnum.TXT){
 			extra = "dayaedu?courseScheduleID=" + studentCourseHomework.getId() + "&userId=" + studentCourseHomework.getUserId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
 			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_STUDENT_REPLY_PUSH,studentCourseHomework.getUserId().toString(),extra,
 					new String[]{courseSchedule.getActualTeacherId().toString()},
@@ -102,7 +102,7 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 		String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
 		String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
 		String extra = "";
-		if (bean.getMsgType() != ImSendTypeEnum.TXT_MSG){
+		if (bean.getMsgType() != ImSendTypeEnum.TXT){
 			extra = "dayaedu?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0&" + "userId=" + studentCourseHomework.getUserId();
 			sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_TEACHER_REPLY_PUSH,courseSchedule.getActualTeacherId().toString(),extra,
 					new String[]{studentCourseHomework.getUserId().toString()},

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

@@ -382,7 +382,10 @@ public class StudentManageServiceImpl implements StudentManageService {
         sysUser.setImToken(register.getToken());
         teacherDao.updateUser(sysUser);
         sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
-        studentService.upSet(new Student(userId,studentRegistrationDao.getSubjectIds(userId)));
+        Student student = new Student(userId, studentRegistrationDao.getSubjectIds(userId));
+        student.setOperatingTag(sysUser.getOperatingTag());
+        student.setServiceTag(sysUser.getServiceTag());
+        studentService.upSet(student);
         return userId;
     }
 

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

@@ -345,8 +345,8 @@
                  LEFT JOIN vip_group vg ON cssp.music_group_id_ = vg.id_ AND cssp.group_type_ = 'VIP'
                  LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.teach_mode_ = 'ONLINE'
                  LEFT JOIN student s ON s.user_id_ = cssp.user_id_
-        WHERE vg.id_ >= 1
-          AND cs.id_ >= 1
+        WHERE cs.id_ >= 1
+          AND vg.id_ >= 1
           AND (cs.is_lock_ IS NULL OR cs.is_lock_ = 0)
           AND s.operating_tag_ = 0
         GROUP BY vg.organ_id_

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

@@ -114,9 +114,10 @@
         SELECT su.id_ user_id_,su.username_,su.gender_,su.phone_ parents_phone_,su.real_name_,
         su.birthdate_,su.nation_,su.organ_id_,
         CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
-        CASE WHEN pla.id_ IS NULL THEN 0 ELSE 1 END isMake_
+        CASE WHEN pla.id_ IS NULL THEN 0 ELSE 1 END isMake_,st.service_tag_,st.operating_tag_
         FROM sys_user su
         LEFT JOIN practice_lesson_apply pla ON su.id_ = pla.user_id_
+        LEFT JOIN student st ON st.user_id_ = su.id_
         <include refid="findStudentsByOrganIdSql"/>
         ORDER BY su.create_time_ DESC
         <include refid="global.limit"/>
@@ -142,6 +143,12 @@
             <if test="isMake != null and isMake == false">
                 AND pla.id_ IS NULL
             </if>
+            <if test="operatingTag != null">
+                AND st.operating_tag_ = #{operatingTag}
+            </if>
+            <if test="serviceTag != null">
+                AND st.service_tag_ = #{serviceTag}
+            </if>
             <if test="userIds != null">
                 AND su.id_ IN
                 <foreach collection="userIds" open="(" close=")" separator="," item="item">
@@ -156,6 +163,7 @@
         FROM sys_user su
         LEFT JOIN student_registration sr ON su.id_ = sr.user_id_
         LEFT JOIN practice_lesson_apply pla ON su.id_ = pla.user_id_
+        LEFT JOIN student st ON st.user_id_ = su.id_
         WHERE su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = 0
         <include refid="queryHasCourseSql"/>
     </select>
@@ -591,12 +599,19 @@
         <if test="isMake != null and isMake == false">
             AND pla.id_ IS NULL
         </if>
+        <if test="operatingTag != null">
+            AND st.operating_tag_ = #{operatingTag}
+        </if>
+        <if test="serviceTag != null">
+            AND st.service_tag_ = #{serviceTag}
+        </if>
     </sql>
     <select id="queryHasCourse" resultType="java.lang.Integer">
         SELECT su.id_ FROM sys_user su
         LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = su.id_
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         LEFT JOIN practice_lesson_apply pla ON su.id_ = pla.user_id_
+        LEFT JOIN student st ON st.user_id_ = su.id_
         WHERE su.user_type_ LIKE '%STUDENT%' AND cs.status_ != 'OVER' AND su.del_flag_ = 0
         <include refid="queryHasCourseSql"/>
         GROUP BY su.id_
@@ -608,6 +623,7 @@
         LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = su.id_
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         LEFT JOIN practice_lesson_apply pla ON su.id_ = pla.user_id_
+        LEFT JOIN student st ON st.user_id_ = su.id_
         WHERE su.user_type_ LIKE '%STUDENT%' AND cs.status_ != 'OVER' AND su.del_flag_ = 0
         <include refid="queryHasCourseSql"/>
     </select>
@@ -616,6 +632,7 @@
         LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = su.id_
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.status_ != 'OVER'
         LEFT JOIN practice_lesson_apply pla ON su.id_ = pla.user_id_
+        LEFT JOIN student st ON st.user_id_ = su.id_
         <include refid="queryNotCourseSql"/>
         GROUP BY su.id_
         HAVING COUNT(cs.id_) = 0
@@ -627,6 +644,7 @@
         LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = su.id_
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.status_ != 'OVER'
         LEFT JOIN practice_lesson_apply pla ON su.id_ = pla.user_id_
+        LEFT JOIN student st ON st.user_id_ = su.id_
         <include refid="queryNotCourseSql"/>
         GROUP BY su.id_
         HAVING COUNT(cs.id_) = 0)e
@@ -658,6 +676,12 @@
             <if test="isMake != null and isMake == false">
                 and pla.id_ IS NULL
             </if>
+            <if test="operatingTag != null">
+                AND st.operating_tag_ = #{operatingTag}
+            </if>
+            <if test="serviceTag != null">
+                AND st.service_tag_ = #{serviceTag}
+            </if>
         </where>
     </sql>
     <select id="queryStudentHasCourse" resultType="java.util.Map">
@@ -719,6 +743,8 @@
         <result property="organId" column="organ_id_"/>
         <result property="subjectName" column="music_group_subject_"/>
         <result property="courseBalance" column="course_balance_"/>
+        <result property="serviceTag" column="service_tag_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="operatingTag" column="operating_tag_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
     <select id="queryHasCourseStudent" resultMap="studentManageListDto">
         SELECT su.id_ user_id_,su.username_,su.gender_,GROUP_CONCAT(DISTINCT sr.parents_name_)parents_name_,

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

@@ -234,10 +234,10 @@ public class ExportController extends BaseController {
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员编号", "学员姓名", "性别", "家长姓名",
                     "家长联系电话", "是否激活", "是否有课", "是否预约网管课", "是否有网管课", "课程余额(元)",
-                    "所在乐团", "乐团所属声部", "所在乐团状态", "所在vip课", "所在VIP状态"}, new String[]{
+                    "所在乐团", "乐团所属声部", "所在乐团状态", "所在vip课", "所在VIP状态", "服务标签", "运营标签"}, new String[]{
                     "organName", "userId", "username", "gender.description", "parentsName", "parentsPhone",
                     "isActive.msg", "hasCourse.msg", "isMake.msg", "hasPracticeCourse.msg", "courseBalance", "musicGroupName",
-                    "subjectName", "musicGroupStatus", "vipGroupName", "vipGroupStatus"}, rows);
+                    "subjectName", "musicGroupStatus", "vipGroupName", "vipGroupStatus", "serviceTag.msg", "operatingTag.msg"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();