Merge branch 'online1'

# Conflicts:
#	mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml
#	mec-biz/src/main/resources/config/mybatis/TeacherCourseStatisticsMapper.xml
#	mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

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

@@ -664,14 +664,13 @@
     </select>
 
     <select id="findUserMusicGroupCooperationOrgan" resultMap="com.ym.mec.biz.dal.dao.CooperationOrganDao.CooperationOrgan">
-        SELECT co.name_,s.name_ linkman_
+        SELECT co.name_
         FROM music_group mg
         LEFT JOIN student_registration sr ON sr.music_group_id_ = mg.id_
         LEFT JOIN cooperation_organ co ON co.id_ = mg.cooperation_organ_id_
-        LEFT JOIN school s ON s.id_ = mg.school_id_
         WHERE sr.user_id_ = #{userId}
-        AND mg.status_ = 'PROGRESS'
-        AND sr.music_group_status_ = 'NORMAL'
+        AND mg.status_ IN ('PREPARE','PROGRESS','PAUSE','CLOSE')
+        AND sr.payment_status_ = 2
         ORDER BY sr.id_ ASC
         LIMIT 1
     </select>

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

@@ -634,14 +634,12 @@
     </update>
 
     <select id="findStudentByMusicGroupIdAndUserId" resultMap="StudentRegistration">
-        SELECT s.name_ school_name_,s2.name_ subject_name_,mgsp.kit_group_purchase_type_ kit_group_purchase_type_,
-        mgsp.deposit_fee_, co.name_ remark_ FROM student_registration sr
+        SELECT s.name_ school_name_,s2.name_ subject_name_,co.name_ remark_ FROM student_registration sr
         LEFT JOIN music_group mg ON mg.id_ =sr.music_group_id_
         LEFT JOIN school s ON mg.school_id_ = s.id_
         LEFT JOIN subject s2 ON sr.actual_subject_id_ = s2.id_
-        LEFT JOIN music_group_subject_plan mgsp ON mgsp.subject_id_ = sr.actual_subject_id_ AND mgsp.music_group_id_ = sr.music_group_id_
         LEFT JOIN cooperation_organ co ON mg.cooperation_organ_id_ = co.id_
-        WHERE sr.music_group_id_ = #{musicGroupId} AND sr.user_id_ = #{userId} AND sr.music_group_status_ != 'QUIT' LIMIT 1
+        WHERE sr.music_group_id_ = #{musicGroupId} AND sr.user_id_ = #{userId} AND sr.payment_status_ =2 ORDER BY sr.id_ DESC LIMIT 1
     </select>
     <select id="queryStudentMusicGroup" resultType="java.lang.String">
         SELECT DISTINCT sr.music_group_id_ FROM student_registration sr

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

@@ -22,10 +22,32 @@
         <result column="phone_" jdbcType="VARCHAR" property="phone"/>
         <result column="organ_name_" jdbcType="VARCHAR" property="organName"/>
         <result column="month_str_" jdbcType="VARCHAR" property="monthStr"/>
-        <collection property="subjectList" ofType="com.ym.mec.biz.dal.entity.Subject">
-            <result column="subject_id" property="id"/>
-            <result column="subject_name" property="name"/>
-        </collection>
+        <association property="subjectList"
+                     select="com.ym.mec.biz.dal.dao.SubjectDao.findBySubjectByIdList"
+                        column="{subjectIdList = tcs.subject_id_list_}"/>
+    </resultMap>
+
+    <resultMap id="TeacherCourseStatistics1" type="com.ym.mec.biz.dal.entity.TeacherCourseStatistics">
+        <result column="id_" jdbcType="BIGINT" property="id"/>
+        <result column="user_id_" jdbcType="INTEGER" property="userId"/>
+        <result column="organ_id_" jdbcType="INTEGER" property="organId"/>
+        <result column="month_" jdbcType="DATE" property="month"/>
+        <result column="subject_id_list_" jdbcType="VARCHAR" property="subjectIdList"/>
+        <result column="vip_course_num_" jdbcType="INTEGER" property="vipCourseNum"/>
+        <result column="music_course_num_" jdbcType="INTEGER" property="musicCourseNum"/>
+        <result column="practice_course_num_" jdbcType="INTEGER" property="practiceCourseNum"/>
+        <result column="expect_music_course_salary_" jdbcType="DECIMAL" property="expectMusicCourseSalary"/>
+        <result column="expect_vip_course_salary_" jdbcType="DECIMAL" property="expectVipCourseSalary"/>
+        <result column="expect_practice_course_salary_" jdbcType="DECIMAL" property="expectPracticeCourseSalary"/>
+        <result column="expect_total_salary_" jdbcType="DECIMAL" property="expectTotalSalary"/>
+        <result column="low_salary" jdbcType="DECIMAL" property="lowSalary"/>
+        <result column="average_class_minutes_" jdbcType="INTEGER" property="averageClassMinutes"/>
+        <result column="statistics_date_time_" jdbcType="DATE" property="statisticsDateTime"/>
+        <result column="group_type_" jdbcType="VARCHAR" property="groupType"/>
+        <result column="real_name_" jdbcType="VARCHAR" property="realName"/>
+        <result column="phone_" jdbcType="VARCHAR" property="phone"/>
+        <result column="organ_name_" jdbcType="VARCHAR" property="organName"/>
+        <result column="month_str_" jdbcType="VARCHAR" property="monthStr"/>
     </resultMap>
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.TeacherCourseStatistics" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
@@ -61,7 +83,7 @@
     </delete>
 
     <!-- 查找下月排课小于基准课酬的老师-->
-    <select id="findUserByWarringSalary" resultMap="TeacherCourseStatistics"><![CDATA[
+    <select id="findUserByWarringSalary" resultMap="TeacherCourseStatistics1"><![CDATA[
         SELECT ctt.expect_total_salary_, t.id_ user_id_,t.organ_id_,t.subject_id_ subject_id_list_,
                ctt.average_class_minutes_
         FROM teacher t
@@ -84,7 +106,7 @@
           AND t.organ_id_ IS NOT NULL
         ]]>
   </select>
-    <select id="findUserCourseSalaryByUserIds" resultMap="TeacherCourseStatistics">
+    <select id="findUserCourseSalaryByUserIds" resultMap="TeacherCourseStatistics1">
         SELECT SUM(csts.expect_salary_) expect_total_salary_, COUNT(csts.id_) music_course_num_, csts.user_id_, csts.group_type_
         FROM course_schedule_teacher_salary csts LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
         WHERE csts.user_id_ IN

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

@@ -1210,10 +1210,6 @@ public class ExportController extends BaseController {
                 if (cooperationOrgan != null) {
                     row.setCooperationOrganName(cooperationOrgan.getName());
                 }
-                if (row.getSchoolName() == null && cooperationOrgan != null) {
-                    //linkman 赋予教学点值
-                    row.setSchoolName(cooperationOrgan.getLinkman());
-                }
             }
             if (row.getMusicGroupId() != null && row.getMusicGroupId().equals("null")) {
                 row.setMusicGroupId("");
@@ -1294,26 +1290,11 @@ public class ExportController extends BaseController {
                 if (row.getNextPaymentDate() != null) {
                     row.setNextPaymentDateStr(DateUtil.format(row.getNextPaymentDate(), DateUtil.DEFAULT_PATTERN));
                 }
-                if (Objects.isNull(row.getCarePackage()) || row.getCarePackage().equals(0)) {
-                    row.setCarePackageStr("不可用");
-                } else if (row.getCarePackage().equals(1)) {
-                    row.setCarePackageStr("可用");
-                } else if (row.getCarePackage().equals(2)) {
-                    row.setCarePackageStr("已使用");
-                }
-                if (Objects.isNull(row.getComeOnPackage()) || row.getComeOnPackage().equals(0)) {
-                    row.setComeOnPackageStr("不可用");
-                } else if (row.getComeOnPackage().equals(1)) {
-                    row.setComeOnPackageStr("可用");
-                } else if (row.getComeOnPackage().equals(2)) {
-                    row.setComeOnPackageStr("已使用");
-                }
             }
             String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级", "班级", "专业", "学员状态", "新增学员", "缴费金额",
-                    "下次缴费日期", "是否报名缴费", "是否激活", "是否有剩余VIP", "是否有剩余网管课", "欠费总额", "关心包", "加油包"};
+                        "下次缴费日期", "是否报名缴费", "是否激活", "是否有剩余VIP", "是否有剩余网管课", "欠费总额"};
             String[] body = {"userId", "realName", "gender", "phone", "currentGrade", "currentClass", "subjectName", "studentStatus", "isNewStudentStr",
-                    "courseFee", "nextPaymentDateStr", "paymentStatus.desc", "activeName", "hasVip ? '是' : '否'", "hasPractice ? '是' : '否'", "noPaymentAmount",
-                    "carePackageStr", "comeOnPackageStr"};
+                    "courseFee", "nextPaymentDateStr", "paymentStatus.desc", "activeName", "hasVip ? '是' : '否'", "hasPractice ? '是' : '否'","noPaymentAmount"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, musicGroupStudentsDtoPageInfo.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
@@ -2360,10 +2341,8 @@ public class ExportController extends BaseController {
             //如果合作单位不存在取学员的第一个乐团的合作单位和教学点
             if (row.getCooperationOrganName() == null) {
                 CooperationOrgan cooperationOrgan = musicGroupDao.findUserMusicGroupCooperationOrgan(row.getUserId());
-                row.setCooperationOrganName(cooperationOrgan.getName());
-                if (row.getSchoolName() != null) {
-                    //linkman 赋予教学点值
-                    row.setSchoolName(cooperationOrgan.getLinkman());
+                if (cooperationOrgan != null) {
+                    row.setCooperationOrganName(cooperationOrgan.getName());
                 }
             }
             if (row.getMusicGroupId() != null && row.getMusicGroupId().equals("null")) {