|
@@ -180,6 +180,8 @@ public class ExportServiceImpl implements ExportService {
|
|
|
private SysMusicCompareRecordDao sysMusicCompareRecordDao;
|
|
|
@Autowired
|
|
|
private StudentOperatingVisitDao studentOperatingVisitDao;
|
|
|
+ @Autowired
|
|
|
+ private OperatingReportNewService operatingReportNewService;
|
|
|
|
|
|
private static final ExecutorService exportExecutorService = Executors.newFixedThreadPool(10);
|
|
|
@Autowired
|
|
@@ -346,6 +348,7 @@ public class ExportServiceImpl implements ExportService {
|
|
|
exportFuncMap.put(ExportEnum.EXPORT_BILL, info -> exportBill(info));
|
|
|
exportFuncMap.put(ExportEnum.EXPORT_OPERATING_VISIT_STATISTICS, info -> exportOperatorVisit(info));
|
|
|
exportFuncMap.put(ExportEnum.EXPORT_STUDENT_SERVE_INFO, (info) -> exportStudentServeInfo(info));
|
|
|
+ exportFuncMap.put(ExportEnum.EXPORT_OPERATING_REPORT_NEW, (info) -> exportOperatingNew(info));
|
|
|
|
|
|
|
|
|
//导出到报表中心
|
|
@@ -386,6 +389,13 @@ public class ExportServiceImpl implements ExportService {
|
|
|
return studentOperatingVisitDao.sumVisit(month,tenantId.equals("-1")?null:tenantId);
|
|
|
}
|
|
|
|
|
|
+ //经营报表
|
|
|
+ private List<OperatingReportNew> exportOperatingNew(Map<String, Object> info){
|
|
|
+ OperatingReportNewQueryInfo queryInfo = JSONObject.parseObject(JSONObject.toJSONString(info), OperatingReportNewQueryInfo.class);
|
|
|
+ queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
|
|
|
+ return operatingReportNewService.queryPage(queryInfo).getRows();
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
//导出对账单
|
|
|
@Override
|