|
|
@@ -187,6 +187,8 @@ public class ExportServiceImpl implements ExportService {
|
|
|
private StudentStatisticsDao studentStatisticsDao;
|
|
|
@Autowired
|
|
|
private StudentTeacherMapperDao studentTeacherMapperDao;
|
|
|
+ @Autowired
|
|
|
+ private SchoolDao schoolDao;
|
|
|
|
|
|
private static final ExecutorService exportExecutorService = Executors.newFixedThreadPool(10);
|
|
|
@Autowired
|
|
|
@@ -2170,6 +2172,10 @@ 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());
|
|
|
+ }
|
|
|
}
|
|
|
//如果有服务收入那么是课程学校采买
|
|
|
if (subtract.compareTo(BigDecimal.ZERO) == 0) {
|
zouxuan