经营报表导出

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -2560,24 +2560,23 @@ public class ExportServiceImpl implements ExportService {
                 incomeDto.setLargeInstruments(incomeDto.getLargeInstruments()
                         .add(row.getLargeMusicalFee()));
                 //其他?
-                //服务收入
-                incomeDto.setServiceIncome(incomeDto.getLargeInstruments()
-                        .add(incomeDto.getStudentGuidanceIncome())
-                        .add(incomeDto.getCoursePurchaseIncome())
-                        .add(incomeDto.getExamIncome())
-                        .add(incomeDto.getMaintenanceCost())
-                        .add(incomeDto.getInstrumentInsuranceCost())
-                        .add(incomeDto.getOtherServiceIncome())
-                );
-                //销售收入
-                incomeDto.setSalesIncome(incomeDto.getSalesIncome()
-                        .add(incomeDto.getGroupPurchaseInstruments())
-                        .add(incomeDto.getGroupPurchaseTeachingAids())
-                        .add(incomeDto.getLargeInstruments())
-                );
             }
             incomeDto.setCloudCoachIncome(incomeDto.getCloudCoachIncome().add(personIncomeMap.getOrDefault(organId,BigDecimal.ZERO)));
-            incomeDto.setSalesIncome(incomeDto.getSalesIncome().add(incomeDto.getCloudCoachIncome()));
+            //服务收入
+            incomeDto.setServiceIncome(incomeDto.getLargeInstruments()
+                    .add(incomeDto.getStudentGuidanceIncome())
+                    .add(incomeDto.getCoursePurchaseIncome())
+                    .add(incomeDto.getExamIncome())
+                    .add(incomeDto.getMaintenanceCost())
+                    .add(incomeDto.getInstrumentInsuranceCost())
+                    .add(incomeDto.getOtherServiceIncome())
+            );
+            incomeDto.setSalesIncome(incomeDto.getSalesIncome()
+                    .add(incomeDto.getCloudCoachIncome())
+                    .add(incomeDto.getGroupPurchaseInstruments())
+                    .add(incomeDto.getGroupPurchaseTeachingAids())
+                    .add(incomeDto.getLargeInstruments())
+            );
             incomeDtos.add(incomeDto);
         }
         HSSFWorkbook workbook = getHSSFWorkbook(incomeDtos, ExportEnum.EXPORT_OPERATING_SUMMARY_INCOME);