|
|
@@ -1835,7 +1835,7 @@ public class ExportServiceImpl implements ExportService {
|
|
|
long i = 1;
|
|
|
Map<Integer, String> cooperationOrganMap = new HashMap<>();
|
|
|
List<Integer> cooperationOrganIds = studentPaymentOrderExportDtos.stream()
|
|
|
- .filter(e -> OUTORDER.equals(e.getType()))
|
|
|
+ .filter(e -> OUTORDER.equals(e.getType()) || OUTORDER.equals(e.getGroupType()))
|
|
|
.filter(e -> e.getMusicGroupId() != null)
|
|
|
.map(e -> Integer.valueOf(e.getMusicGroupId()))
|
|
|
.distinct()
|
|
|
@@ -2172,10 +2172,7 @@ public class ExportServiceImpl implements ExportService {
|
|
|
row.setMaintenanceProductFee(BigDecimal.ZERO);
|
|
|
row.setOtherFee(BigDecimal.ZERO);
|
|
|
row.setLargeMusicalFee(add);
|
|
|
- School school = schoolDao.get(Integer.parseInt(row.getMusicGroupId()));
|
|
|
- if(school != null){
|
|
|
- row.setCooperationOrganName(school.getName());
|
|
|
- }
|
|
|
+ row.setCooperationOrganName(cooperationOrganMap.get(Integer.parseInt(row.getMusicGroupId())));
|
|
|
}
|
|
|
//如果有服务收入那么是课程学校采买
|
|
|
if (subtract.compareTo(BigDecimal.ZERO) == 0) {
|
zouxuan