订单导出调整

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

@@ -173,6 +173,20 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
         COURSE_SCHOOL_BUY("COURSE_SCHOOL_BUY", "课程学校采买"),
         COURSE_STUDENT_BUY("COURSE_STUDENT_BUY", "课程家长采买"),
         LARGE_MUSICAL("LARGE_MUSICAL", "大件乐器"),
+        LEVEL("LEVEL","考级"),
+        SUBJECT_CHARGE("SUBJECT_CHARGE","声部更改"),
+        MUSIC_CHARGE("MUSIC_CHARGE","乐器更换"),
+        PARTS_SELL("PARTS_SELL","配件销售"),
+        SERVICE_FEE("SERVICE_FEE","维修费"),
+        LUCKY_BAG_ACTIVE("LUCKY_BAG_ACTIVE","福袋活动"),
+        VISITING_FEE("VISITING_FEE","上门费"),
+        VIP_BUY("VIP_BUY","VIP课购买"),
+        RECHARGE("RECHARGE","账户充值"),
+        MUSIC_UPKEEP("MUSIC_UPKEEP","乐保服务"),
+        DOUBLE_ELEVEN2020("DOUBLE_ELEVEN2020","2020双十一活动"),
+        HIGH_ONLINE_ACTIVITY("HIGH_ONLINE_ACTIVITY","网基课活动"),
+        PRACTICE_GROUP_BUY("PRACTICE_GROUP_BUY","加油包"),
+        CLOUD_TEACHER_BUY("CLOUD_TEACHER_BUY","系统购买"),
         OTHER("OTHER", "其他");
 
         private String code;
@@ -198,7 +212,7 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
     //学员没有历史VIP课程则导出为【VIP课新增】
     //学员有历史VIP课程到导出为【VIP课续费】……
     @ApiModelProperty(value = "课程形态描述",required = true)
-    private TypeDesc typeDesc;
+    private String typeDesc;
 
     //该笔订单为乐团订单则导出该乐团的【乐团名称】
     //该笔订单非乐团订单时，查询学员是否有在读乐团，无则导出为空，有则导出该学员【进行中】【暂停】乐团名称，进行中>暂停，多个进行中则导出加入乐团时间最近的乐团名称
@@ -259,11 +273,11 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
         this.feeMusicGroupId = feeMusicGroupId;
     }
 
-    public TypeDesc getTypeDesc() {
+    public String getTypeDesc() {
         return typeDesc;
     }
 
-    public void setTypeDesc(TypeDesc typeDesc) {
+    public void setTypeDesc(String typeDesc) {
         this.typeDesc = typeDesc;
     }
 

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

@@ -1685,17 +1685,17 @@ public class ExportServiceImpl implements ExportService {
                     if (cooperationId != null) {
                         String firstMusicId = firstMusicMap.get(cooperationId);
                         if (StringUtils.isEmpty(firstMusicId)) {
-                            row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_MUSIC);
+                            row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_MUSIC.getMsg());
                         } else {
                             if (Objects.equals(firstMusicId, row.getMusicGroupId())) {
-                                row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_MUSIC);
+                                row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_MUSIC.getMsg());
                             } else {
-                                row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.ADD_MUSIC);
+                                row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.ADD_MUSIC.getMsg());
                             }
                         }
                     }
                 } else {
-                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_MUSIC);
+                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_MUSIC.getMsg());
                 }
             } else {
                 row.setFeeMusicGroupId(userLastMusicIdMap.get(row.getUserId()));
@@ -1752,9 +1752,9 @@ public class ExportServiceImpl implements ExportService {
                                 //学员没有历史VIP课程则导出为【VIP课新增】
                                 //学员有历史VIP课程到导出为【VIP课续费]
                                 if (Objects.equals(userFirstVipMap.get(row.getUserId()), row.getMusicGroupId())) {
-                                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_VIP);
+                                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_VIP.getMsg());
                                 } else {
-                                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_VIP);
+                                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_VIP.getMsg());
                                 }
                             }
                             break;
@@ -1790,9 +1790,9 @@ public class ExportServiceImpl implements ExportService {
                     //学员没有历史VIP课程则导出为【VIP课新增】
                     //学员有历史VIP课程到导出为【VIP课续费]
                     if (Objects.equals(userFirstVipMap.get(row.getUserId()), row.getMusicGroupId())) {
-                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_VIP);
+                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_VIP.getMsg());
                     } else {
-                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_VIP);
+                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_VIP.getMsg());
                     }
                 }
             } else if (row.getGroupType() == GroupType.ACTIVITY) {
@@ -1800,7 +1800,7 @@ public class ExportServiceImpl implements ExportService {
             } else if (row.getGroupType() == GroupType.MEMBER) {
                 row.setCloudTeacherFee(row.getActualAmount());
                 if (row.getTypeDesc() == null) {
-                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.OTHER);
+                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.OTHER.getMsg());
                 }
             } else if (row.getGroupType().equals(GroupType.SPORADIC)) {
                 //考级报名
@@ -1850,7 +1850,7 @@ public class ExportServiceImpl implements ExportService {
                     }
                 }
                 if (row.getTypeDesc() == null) {
-                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.OTHER);
+                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.OTHER.getMsg());
                 }
             } else if (row.getGroupType().equals(GroupType.PRACTICE)) {
                 row.setPracticeCourseFee(row.getActualAmount());
@@ -1861,9 +1861,9 @@ public class ExportServiceImpl implements ExportService {
                 }
                 if (row.getTypeDesc() == null) {
                     if (Objects.equals(userFirstPracticeMap.get(row.getUserId()), row.getMusicGroupId())) {
-                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_PRACTICE);
+                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_PRACTICE.getMsg());
                     } else {
-                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_PRACTICE);
+                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_PRACTICE.getMsg());
                     }
                 }
             } else if (row.getGroupType().equals(GroupType.REPLACEMENT)) {
@@ -1880,7 +1880,7 @@ public class ExportServiceImpl implements ExportService {
                 }
             } else if (row.getGroupType().equals(GroupType.GOODS_SELL)) {
                 row.setRetailGoodsFee(row.getActualAmount());
-                row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RETAIL_GOODS);
+                row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RETAIL_GOODS.getMsg());
             } else {
                 List<StudentPaymentOrderExportDto> exportDtoList = feeByTypeMap.get(row.getId());
                 if (!CollectionUtils.isEmpty(exportDtoList)) {
@@ -1897,7 +1897,7 @@ public class ExportServiceImpl implements ExportService {
                             //判断之前是否有付费订单，如果没有，那么是乐团转化
                             int orderNum = studentPaymentOrderDao.getStudentMusicOrderNum(row.getMusicGroupId(), row.getUserId(), row.getId());
                             if (orderNum == 0) {
-                                row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.MUSIC_CONVERT);
+                                row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.MUSIC_CONVERT.getMsg());
                             }
                         }
                         StudentRegistration studentRegistration = studentRegistrationDao.findStudentByMusicGroupIdAndUserId(row.getMusicGroupId(), row.getUserId());
@@ -1926,7 +1926,7 @@ public class ExportServiceImpl implements ExportService {
                             row.setMaintenanceProductFee(BigDecimal.ZERO);
                             row.setOtherFee(subtract);
                             row.setRetailGoodsFee(add);
-                            row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RETAIL_GOODS);
+                            row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RETAIL_GOODS.getMsg());
                         } else {
                             //拆分导入订单
                             if (row.getType() == OrderTypeEnum.OUTORDER || row.getType() == OrderTypeEnum.SCHOOL) {
@@ -1939,9 +1939,9 @@ public class ExportServiceImpl implements ExportService {
                                 }
                                 //如果有服务收入那么是课程学校采买
                                 if (subtract.compareTo(BigDecimal.ZERO) == 0) {
-                                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.LARGE_MUSICAL);
+                                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.LARGE_MUSICAL.getMsg());
                                 } else {
-                                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.COURSE_SCHOOL_BUY);
+                                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.COURSE_SCHOOL_BUY.getMsg());
                                 }
                                 row.setCourseSchoolBuyAmount(subtract);
                             } else if (row.getType() == OrderTypeEnum.OTHER) {
@@ -1955,9 +1955,9 @@ public class ExportServiceImpl implements ExportService {
                                 row.setMusicGroupCourseFee(subtract);
                                 //如果有服务收入那么是课程学校采买
                                 if (subtract.compareTo(BigDecimal.ZERO) == 0) {
-                                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RETAIL_GOODS);
+                                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RETAIL_GOODS.getMsg());
                                 } else {
-                                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.COURSE_STUDENT_BUY);
+                                    row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.COURSE_STUDENT_BUY.getMsg());
                                 }
                             }
                         }
@@ -1967,9 +1967,9 @@ public class ExportServiceImpl implements ExportService {
                 }
                 if (row.getTypeDesc() == null) {
                     if (row.getGroupType().equals(GroupType.SUBJECT_CHANGE)) {
-                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_MUSIC);
+                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_MUSIC.getMsg());
                     } else if (row.getGroupType().equals(GroupType.REPAIR)) {
-                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.REPAIR);
+                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.REPAIR.getMsg());
                     }
                 }
             }
@@ -2214,7 +2214,7 @@ public class ExportServiceImpl implements ExportService {
                             row.setMaintenanceProductFee(BigDecimal.ZERO);
                             row.setOtherFee(subtract);
                             row.setRetailGoodsFee(add);
-                            row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RETAIL_GOODS);
+                            row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RETAIL_GOODS.getMsg());
                         } else {
                             //拆分导入订单
                             if (row.getType() == OrderTypeEnum.OUTORDER || row.getType() == OrderTypeEnum.SCHOOL) {
@@ -2403,6 +2403,9 @@ public class ExportServiceImpl implements ExportService {
                 paymentChannel = "余额";
             }
             basicOrder.setPaymentChannel(paymentChannel);
+            if(StringUtils.isNotEmpty(basicOrder.getSporadicType()) && !basicOrder.getSporadicType().equals("其他")){
+                basicOrder.setTypeDesc(basicOrder.getSporadicType());
+            }
             if (basicOrder.getRouteAmount().compareTo(BigDecimal.ZERO) == 0) {
                 continue;
             }
@@ -2414,14 +2417,6 @@ public class ExportServiceImpl implements ExportService {
                 basicOrder.setOtherFee(basicOrder.getRouteAmount());
                 continue;
             }
-            //如果是零星收费的账户充值，不管销售还是服务，统一放在其他收费项目中
-            if(basicOrder.getType() == OrderTypeEnum.SPORADIC
-                    && basicOrder.getGroupType() == GroupType.SPORADIC
-                    && basicOrder.getServiceAmount().compareTo(BigDecimal.ZERO) == 0
-                    && basicOrder.getSaleAmount().compareTo(BigDecimal.ZERO) == 0){
-                basicOrder.setOtherFee(basicOrder.getRouteAmount());
-                continue;
-            }
             //如果有订单详情
             List<StudentPaymentOrderDetail> detailList = orderDetailMap.get(basicOrder.getId());
             if (!CollectionUtils.isEmpty(detailList)) {
@@ -2658,22 +2653,22 @@ public class ExportServiceImpl implements ExportService {
                 //学员没有历史VIP课程则导出为【VIP课新增】
                 //学员有历史VIP课程到导出为【VIP课续费]
                 if (Objects.equals(userFirstVipMap.get(basicOrder.getUserId()), basicOrder.getMusicGroupId())) {
-                    basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_VIP);
+                    basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_VIP.getMsg());
                 } else {
-                    basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_VIP);
+                    basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_VIP.getMsg());
                 }
             } else if (basicOrder.getGroupType() == GroupType.PRACTICE) {
                 if (Objects.equals(userFirstPracticeMap.get(basicOrder.getUserId()), basicOrder.getMusicGroupId())) {
-                    basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_PRACTICE);
+                    basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_PRACTICE.getMsg());
                 } else {
-                    basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_PRACTICE);
+                    basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_PRACTICE.getMsg());
                 }
             } else if (basicOrder.getGroupType().equals(GroupType.SUBJECT_CHANGE)) {
-                basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_MUSIC);
+                basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_MUSIC.getMsg());
             } else if (basicOrder.getGroupType().equals(GroupType.REPAIR)) {
-                basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.REPAIR);
+                basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.REPAIR.getMsg());
             } else {
-                basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.OTHER);
+                basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.OTHER.getMsg());
             }
         }
     }
@@ -2897,9 +2892,9 @@ public class ExportServiceImpl implements ExportService {
             //学员没有历史VIP课程则导出为【VIP课新增】
             //学员有历史VIP课程到导出为【VIP课续费】
             if (Objects.equals(userFirstVipMap.get(basicOrder.getUserId()), basicOrder.getMusicGroupId())) {
-                basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_VIP);
+                basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_VIP.getMsg());
             } else {
-                basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_VIP);
+                basicOrder.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_VIP.getMsg());
             }
         }
     }
@@ -2992,17 +2987,17 @@ public class ExportServiceImpl implements ExportService {
                 if (cooperationId != null) {
                     String firstMusicId = firstMusicMap.get(cooperationId);
                     if (StringUtils.isEmpty(firstMusicId)) {
-                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_MUSIC);
+                        row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_MUSIC.getMsg());
                     } else {
                         if (Objects.equals(firstMusicId, row.getMusicGroupId())) {
-                            row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_MUSIC);
+                            row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.NEW_MUSIC.getMsg());
                         } else {
-                            row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.ADD_MUSIC);
+                            row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.ADD_MUSIC.getMsg());
                         }
                     }
                 }
             } else {
-                row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_MUSIC);
+                row.setTypeDesc(StudentPaymentOrderExportDto.TypeDesc.RENEW_MUSIC.getMsg());
             }
         } else {
             row.setFeeMusicGroupId(userLastMusicIdMap.get(row.getUserId()));

mec-web/src/main/resources/exportColumnMapper.ini

@@ -112,11 +112,11 @@ fieldColumns = ["userId", "username", "phone", "type.msg", "name", "actualSalary
 
 [订单列表导出1]
 headColumns = ["序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额", "现金支付", "余额支付", "优惠金额", "课程家长采买","课程学校采买", "VIP课", "网管课", "乐理课", "考级", "维修费用", "乐保费用", "云教练", "押金", "乐器", "教辅费用", "上门费","账户充值", "零售乐器","大件乐器", "其它", "汇付手续费","平台手续费", "到账时间","关联乐团ID/VIP课ID","课程形态","类型","收费乐团编号","收费乐团","零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"]
-fieldColumns = ["id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount","balancePaymentAmount","couponRemitFee","musicGroupCourseFee","courseSchoolBuyAmount", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee","leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee","retailGoodsFee","largeMusicalFee", "otherFee", "transferFee", "platformFee", "payTime", "musicGroupId","groupType.desc","typeDesc.msg","feeMusicGroupId","feeMusicGroupName", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"]
+fieldColumns = ["id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount","balancePaymentAmount","couponRemitFee","musicGroupCourseFee","courseSchoolBuyAmount", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee","leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee","retailGoodsFee","largeMusicalFee", "otherFee", "transferFee", "platformFee", "payTime", "musicGroupId","groupType.desc","typeDesc","feeMusicGroupId","feeMusicGroupName", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"]
 
 [订单列表导出2]
 headColumns = ["序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额", "现金支付", "余额支付", "优惠金额","课程家长采买","课程学校采买", "VIP课", "网管课", "乐理课", "考级", "维修费用", "乐保费用", "云教练", "押金", "乐器", "教辅费用", "上门费","账户充值", "零售乐器","大件乐器", "其它","平台手续费", "到账时间",    "关联乐团ID/VIP课ID", "课程形态","类型","收费乐团编号","收费乐团", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"]
-fieldColumns = ["id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount", "balancePaymentAmount",  "couponRemitFee",     "musicGroupCourseFee","courseSchoolBuyAmount", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee",     "leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee","retailGoodsFee","largeMusicalFee", "otherFee", "platformFee", "payTime", "musicGroupId", "groupType.desc","typeDesc.msg","feeMusicGroupId","feeMusicGroupName", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"]
+fieldColumns = ["id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount", "balancePaymentAmount",  "couponRemitFee",     "musicGroupCourseFee","courseSchoolBuyAmount", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee",     "leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee","retailGoodsFee","largeMusicalFee", "otherFee", "platformFee", "payTime", "musicGroupId", "groupType.desc","typeDesc","feeMusicGroupId","feeMusicGroupName", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"]
 
 [订单列表汇总导出]
 headColumns = ["分部", "订单金额", "应付金额", "现金支付", "余额支付", "优惠金额","课程家长采买","课程学校采买", "VIP课", "网管课", "乐理课", "考级", "维修费用", "乐保费用", "云教练", "押金", "乐器", "教辅费用", "上门费","账户充值", "零售乐器","大件乐器", "其它"]
@@ -172,11 +172,11 @@ fieldColumns = ["organization.name", "id", "name", "isEnable == true ? '是':'
 
 [财务管理导出1]
 headColumns = ["序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额", "现金支付", "余额支付", "分润账户", "分润金额", "分配余额", "优惠金额", "乐团课", "VIP课", "网管课", "乐理课", "考级", "维修费用", "乐保费用", "云教练", "押金", "乐器", "教辅费用", "上门费", "账户充值", "其它", "汇付手续费", "平台手续费", "到账时间", "关联乐团ID/VIP课ID", "课程形态","类型","收费乐团编号","收费乐团", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"]
-fieldColumns = ["id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance",  "couponRemitFee",     "musicGroupCourseFee", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee", "leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee", "otherFee", "transferFee", "platformFee", "payTime", "musicGroupId", "groupType.desc","typeDesc.msg","feeMusicGroupId","feeMusicGroupName", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"]
+fieldColumns = ["id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance",  "couponRemitFee",     "musicGroupCourseFee", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee", "leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee", "otherFee", "transferFee", "platformFee", "payTime", "musicGroupId", "groupType.desc","typeDesc","feeMusicGroupId","feeMusicGroupName", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"]
 
 [财务管理导出2]
 headColumns = ["序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额", "现金支付", "余额支付", "分润账户", "分润金额", "分配余额", "优惠金额", "乐团课", "VIP课", "网管课", "乐理课", "考级", "维修费用", "乐保费用", "云教练", "押金", "乐器", "教辅费用", "上门费", "账户充值", "其它", "平台手续费", "到账时间", "关联乐团ID/VIP课ID", "课程形态","类型","收费乐团编号","收费乐团", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"]
-fieldColumns = ["id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount" , "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance",  "couponRemitFee",     "musicGroupCourseFee", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee", "leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee", "otherFee", "platformFee", "payTime", "musicGroupId", "groupType.desc","typeDesc.msg","feeMusicGroupId","feeMusicGroupName", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"]
+fieldColumns = ["id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount" , "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance",  "couponRemitFee",     "musicGroupCourseFee", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee", "leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee", "otherFee", "platformFee", "payTime", "musicGroupId", "groupType.desc","typeDesc","feeMusicGroupId","feeMusicGroupName", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"]
 
 [老师默认课酬导出]
 headColumns = ["老师编号", "姓名", "分部", "工作类型", "在职状态", "老师状态", "1v1", "1v2", "1v3", "1v4", "1v5", "1v6", "1v7","网管课", "单技课2.0(主教)", "合奏课2.0(主教)", "综合课2.0(主教)", "集训单技课2.0(主教)", "集训合奏课2.0(主教)","基础技能课2.0(主教)", "课堂课(主教)", "单技课3.0(主教)", "合奏课3.0(主教)", "综合课3.0(主教)", "集训单技课3.0(主教)", "集训合奏课3.0(主教)","基础技能课3.0(主教)", "单技课2.0(助教)", "合奏课2.0(助教)", "综合课2.0(助教)", "集训单技课2.0(助教)", "集训合奏课2.0(助教)","基础技能课2.0(助教)", "课堂课(助教)", "单技课3.0(助教)", "合奏课3.0(助教)", "综合课3.0(助教)", "集训单技课3.0(助教)", "集训合奏课3.0(助教)","基础技能课3.0(助教)", "网络基础训练课1v3", "网络基础训练课1v4", "网络基础训练课1v5", "乐团网管课1v1"]