|
@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.dto.*;
|
|
|
import com.ym.mec.biz.dal.entity.*;
|
|
|
import com.ym.mec.biz.dal.enums.GroupType;
|
|
|
import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
|
|
|
+import com.ym.mec.biz.dal.enums.OrderTypeEnum;
|
|
|
import com.ym.mec.biz.dal.page.CourseScheduleTeacherSalaryQueryInfo;
|
|
|
import com.ym.mec.biz.dal.page.MusicGroupStudentQueryInfo;
|
|
|
import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
|
|
@@ -209,7 +210,7 @@ public class ExportController extends BaseController {
|
|
|
if (studentRegistration != null) {
|
|
|
row.setSubjectName(studentRegistration.getSubjectName());
|
|
|
row.setSchoolName(studentRegistration.getSchoolName());
|
|
|
- if (studentRegistration.getKitType() != null && studentRegistration.getKitType().equals("LEASE")) {
|
|
|
+ if (row.getType().equals(OrderTypeEnum.APPLY) && studentRegistration.getKitType() != null && studentRegistration.getKitType().equals("LEASE")) {
|
|
|
row.setLeaseFee(studentRegistration.getDepositFee());
|
|
|
row.setMusicalFee(BigDecimal.ZERO);
|
|
|
}
|