|
|
@@ -2172,7 +2172,6 @@ public class ExportServiceImpl implements ExportService {
|
|
|
row.setMaintenanceProductFee(BigDecimal.ZERO);
|
|
|
row.setOtherFee(BigDecimal.ZERO);
|
|
|
row.setLargeMusicalFee(add);
|
|
|
- row.setCooperationOrganName(cooperationOrganMap.get(Integer.parseInt(row.getMusicGroupId())));
|
|
|
}
|
|
|
//如果有服务收入那么是课程学校采买
|
|
|
if (subtract.compareTo(BigDecimal.ZERO) == 0) {
|
|
|
@@ -2218,7 +2217,7 @@ public class ExportServiceImpl implements ExportService {
|
|
|
row.setEduTeacher(cooperationOrgan.getLinkman() != null ? cooperationOrgan.getLinkman() : row.getEduTeacher());
|
|
|
}
|
|
|
}
|
|
|
- if (row.getType().equals(OUTORDER) && row.getMusicGroupId() != null) {
|
|
|
+ if ((row.getType().equals(OUTORDER) || row.getGroupType().equals(GroupType.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()));
|
zouxuan