|
@@ -254,6 +254,10 @@ public class ExportServiceImpl implements ExportService {
|
|
|
if (row.getType().equals(OrderTypeEnum.OUTORDER) && row.getMusicGroupId() != null) {
|
|
|
if (cooperationOrganMap.containsKey(Integer.valueOf(row.getMusicGroupId()))) {
|
|
|
row.setCooperationOrganName(cooperationOrganMap.get(Integer.valueOf(row.getMusicGroupId())));
|
|
|
+ CooperationOrgan cooperationOrganEduTeacher = musicGroupDao.findCooperationOrganEduTeacher(Integer.valueOf(row.getMusicGroupId()));
|
|
|
+ if (cooperationOrganEduTeacher != null) {
|
|
|
+ row.setEduTeacher(cooperationOrganEduTeacher.getLinkman());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (row.getMusicGroupId() != null && row.getMusicGroupId().equals("null")) {
|
|
@@ -502,6 +506,10 @@ public class ExportServiceImpl implements ExportService {
|
|
|
if (row.getType().equals(OrderTypeEnum.OUTORDER) && row.getMusicGroupId() != null) {
|
|
|
if (cooperationOrganMap.containsKey(Integer.valueOf(row.getMusicGroupId()))) {
|
|
|
row.setCooperationOrganName(cooperationOrganMap.get(Integer.valueOf(row.getMusicGroupId())));
|
|
|
+ CooperationOrgan cooperationOrganEduTeacher = musicGroupDao.findCooperationOrganEduTeacher(Integer.valueOf(row.getMusicGroupId()));
|
|
|
+ if (cooperationOrganEduTeacher != null) {
|
|
|
+ row.setEduTeacher(cooperationOrganEduTeacher.getLinkman());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (row.getMusicGroupId() != null && row.getMusicGroupId().equals("null")) {
|