update 订单导出增加乐团主管

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

@@ -58,6 +58,8 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
     private String schoolName;
     private String subjectName;
     private String cooperationOrganName;
+    //乐团主管
+    private String eduTeacher;
 
     private Integer chargeType;
 
@@ -329,4 +331,12 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
     public void setMaintenanceProductFee(BigDecimal maintenanceProductFee) {
         this.maintenanceProductFee = maintenanceProductFee;
     }
+
+    public String getEduTeacher() {
+        return eduTeacher;
+    }
+
+    public void setEduTeacher(String eduTeacher) {
+        this.eduTeacher = eduTeacher;
+    }
 }

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

@@ -145,6 +145,7 @@ public class ExportServiceImpl implements ExportService {
                 if (vipGroupInfo != null) {
                     row.setSchoolName(vipGroupInfo.getSchoolName());
                     row.setSubjectName(vipGroupInfo.getSubjectName());
+                    row.setEduTeacher(vipGroupInfo.getEducationalTeacherName());
                 }
             } else if (row.getGroupType().equals(GroupType.SPORADIC)) {
                 //考级报名
@@ -189,6 +190,7 @@ public class ExportServiceImpl implements ExportService {
                 PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(row.getMusicGroupId()));
                 if (practiceGroup != null) {
                     row.setSubjectName(practiceGroup.getSubjectName());
+                    row.setEduTeacher(practiceGroup.getEduTeacherName());
                 }
             } else {
                 StudentPaymentOrderExportDto feeByType = sellOrderDao.getFeeByType(row.getId());
@@ -203,6 +205,7 @@ public class ExportServiceImpl implements ExportService {
                         row.setSubjectName(studentRegistration.getSubjectName());
                         row.setSchoolName(studentRegistration.getSchoolName());
                         row.setCooperationOrganName(studentRegistration.getRemark());
+                        row.setEduTeacher(studentRegistration.getName());
                     }
                     row.setMusicGroupCourseFee(feeByType.getActualAmount().subtract(feeByType.getMusicalFee()).subtract(row.getTeachingFee()).subtract(row.getMaintenanceFee()).subtract(row.getMaintenanceProductFee()).subtract(feeByType.getOtherFee()).subtract(row.getLeaseFee()));
                 } else if (row.getType().equals(OrderTypeEnum.REPAIR)) {
@@ -212,11 +215,12 @@ public class ExportServiceImpl implements ExportService {
                     row.setTransferFee(BigDecimal.ZERO);
                 }
             }
-            //如果合作单位不存在取学员的第一个乐团的合作单位和教学点
+            //如果合作单位不存在取学员的第一个乐团的合作单位,乐团主管
             if (row.getCooperationOrganName() == null) {
                 CooperationOrgan cooperationOrgan = musicGroupDao.findUserMusicGroupCooperationOrgan(row.getUserId());
                 if (cooperationOrgan != null) {
                     row.setCooperationOrganName(cooperationOrgan.getName());
+                    row.setEduTeacher(cooperationOrgan.getLinkman() != null ? cooperationOrgan.getLinkman() : row.getEduTeacher());
                 }
             }
             if (row.getMusicGroupId() != null && row.getMusicGroupId().equals("null")) {
@@ -244,9 +248,9 @@ public class ExportServiceImpl implements ExportService {
         HSSFWorkbook workbook = null;
         try {
             String[] header = {"序号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "应付金额", "现金支付", "余额支付", "乐团课", "VIP课", "网管课", "乐理课", "考级", "维修费用", "押金", "乐器", "教辅费用", "其它", "手续费", "到账时间",
-                    "关联乐团ID/VIP课ID", "课程形态", "零星收款类别", "专业", "分部", "教学点", "合作单位", "备注"};
+                    "关联乐团ID/VIP课ID", "课程形态", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"};
             String[] body = {"id", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "expectAmount", "actualAmount", "balancePaymentAmount", "musicGroupCourseFee", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "leaseFee", "musicalFee", "teachingFee", "otherFee", "transferFee", "payTime", "musicGroupId",
-                    "groupType.desc", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "memo"};
+                    "groupType.desc", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"};
             workbook = POIUtil.exportExcel(header, body, studentPaymentOrderExportDtos);
             workbook.write(fileOutputStream);
             fileOutputStream.getFD().sync();
@@ -360,6 +364,7 @@ public class ExportServiceImpl implements ExportService {
                 if (vipGroupInfo != null) {
                     row.setSchoolName(vipGroupInfo.getSchoolName());
                     row.setSubjectName(vipGroupInfo.getSubjectName());
+                    row.setEduTeacher(vipGroupInfo.getEducationalTeacherName());
                 }
             } else if (row.getGroupType().equals(GroupType.SPORADIC)) {
                 //考级报名
@@ -404,6 +409,7 @@ public class ExportServiceImpl implements ExportService {
                 PracticeCourseDto practiceGroup = practiceGroupDao.findByGroupId(Integer.parseInt(row.getMusicGroupId()));
                 if (practiceGroup != null) {
                     row.setSubjectName(practiceGroup.getSubjectName());
+                    row.setEduTeacher(practiceGroup.getEduTeacherName());
                 }
             } else {
                 StudentPaymentOrderExportDto feeByType = sellOrderDao.getFeeByType(row.getId());
@@ -418,6 +424,7 @@ public class ExportServiceImpl implements ExportService {
                         row.setSubjectName(studentRegistration.getSubjectName());
                         row.setSchoolName(studentRegistration.getSchoolName());
                         row.setCooperationOrganName(studentRegistration.getRemark());
+                        row.setEduTeacher(studentRegistration.getName());
                     }
                     row.setMusicGroupCourseFee(feeByType.getActualAmount().subtract(feeByType.getMusicalFee()).subtract(row.getTeachingFee()).subtract(row.getMaintenanceFee()).subtract(row.getMaintenanceProductFee()).subtract(feeByType.getOtherFee()).subtract(row.getLeaseFee()));
                 } else if (row.getType().equals(OrderTypeEnum.REPAIR)) {
@@ -432,6 +439,7 @@ public class ExportServiceImpl implements ExportService {
                 CooperationOrgan cooperationOrgan = musicGroupDao.findUserMusicGroupCooperationOrgan(row.getUserId());
                 if (cooperationOrgan != null) {
                     row.setCooperationOrganName(cooperationOrgan.getName());
+                    row.setEduTeacher(cooperationOrgan.getLinkman() != null ? cooperationOrgan.getLinkman() : row.getEduTeacher());
                 }
             }
             if (row.getMusicGroupId() != null && row.getMusicGroupId().equals("null")) {
@@ -595,9 +603,9 @@ public class ExportServiceImpl implements ExportService {
         HSSFWorkbook workbook = null;
         try {
             String[] header = {"序号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "应付金额", "现金支付", "余额支付", "分润账户", "分润金额", "分润余额", "乐团课", "VIP课", "网管课", "乐理课", "考级", "维修费用", "押金", "乐器", "教辅费用", "其它", "手续费", "到账时间",
-                    "关联乐团ID/VIP课ID", "课程形态", "零星收款类别", "专业", "分部", "教学点", "合作单位", "备注"};
+                    "关联乐团ID/VIP课ID", "课程形态", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"};
             String[] body = {"id", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance", "musicGroupCourseFee", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "leaseFee", "musicalFee", "teachingFee", "otherFee", "transferFee", "payTime", "musicGroupId",
-                    "groupType.desc", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "memo"};
+                    "groupType.desc", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"};
             workbook = POIUtil.exportExcel(header, body, studentPaymentOrderExportDtos);
             workbook.write(fileOutputStream);
             fileOutputStream.getFD().sync();

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

@@ -674,14 +674,15 @@
     </select>
 
     <select id="findUserMusicGroupCooperationOrgan" resultMap="com.ym.mec.biz.dal.dao.CooperationOrganDao.CooperationOrgan">
-        SELECT co.name_
+        SELECT co.name_,su.real_name_ linkman_
         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 sys_user su ON su.id_ = mg.educational_teacher_id_
         WHERE sr.user_id_ = #{userId}
         AND mg.status_ IN ('PREPARE','PROGRESS','PAUSE','CLOSE')
         AND sr.payment_status_ = 2
-        ORDER BY sr.id_ ASC
+        ORDER BY sr.id_ DESC
         LIMIT 1
     </select>
 

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

@@ -666,11 +666,12 @@
     </update>
 
     <select id="findStudentByMusicGroupIdAndUserId" resultMap="StudentRegistration">
-        SELECT s.name_ school_name_,s2.name_ subject_name_,co.name_ remark_ FROM student_registration sr
+        SELECT s.name_ school_name_,s2.name_ subject_name_,co.name_ remark_,su.real_name_ name_ 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 cooperation_organ co ON mg.cooperation_organ_id_ = co.id_
+        LEFT JOIN sys_user su on mg.educational_teacher_id_ = su.id_
         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">

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

@@ -46,6 +46,7 @@
         <result column="subject_name_" property="subjectName"/>
         <result column="educational_teacher_id_" property="educationalTeacherId"/>
         <result column="vip_group_category_name_" property="vipGroupCategoryName"/>
+        <result column="educational_teacher_name_" property="educationalTeacherName" />
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.entity.School" id="School">
@@ -954,11 +955,12 @@
     </select>
 
     <select id="findVipGroupInfo" resultMap="VipGroup">
-        SELECT vg.*, s.name_ subject_name_, s2.name_ school_name_
+        SELECT vg.*, s.name_ subject_name_, s2.name_ school_name_,su.real_name_ educational_teacher_name_
         FROM vip_group vg
                  LEFT JOIN class_group cg on vg.id_ = cg.music_group_id_
                  LEFT JOIN subject s on cg.subject_id_list_ = s.id_
                  LEFT JOIN school s2 on vg.teacher_school_id_ = s2.id_
+                 LEFT JOIN sys_user su on vg.educational_teacher_id_ = su.id_
         WHERE vg.id_ = #{id}
           AND cg.id_ = #{classGroupId}
           AND cg.group_type_ = 'VIP'