经营报表导出

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

@@ -2337,11 +2337,6 @@ public class ExportServiceImpl implements ExportService {
         //不承担课程的云教练收入
         Map<Integer, BigDecimal> personalCloudAmount = MapUtil.convertIntegerMap(cloudTeacherOrderDao.sumPersonalCloudAmount(month,firstDayOfMonth,lastDayOfMonth));
 
-//        List<Map<Integer, BigDecimal>> personIncomeMapList = cloudTeacherOrderDao.sumPersonIncome(params.get("month").toString());
-//        Map<Integer, BigDecimal> personIncomeMap = new HashMap<>();
-//        if(!CollectionUtils.isEmpty(personIncomeMapList)){
-//            personIncomeMap = MapUtil.convertIntegerMap(personIncomeMapList);
-//        }
         for (Integer organId : listMap.keySet()) {
             OperatingTotalIncomeDto incomeDto = new OperatingTotalIncomeDto();
             incomeDto.setOrganName(userOrganNameMap.get(organId));
@@ -2545,9 +2540,6 @@ public class ExportServiceImpl implements ExportService {
                 //维修费用
                 incomeDto.setMaintenanceCost(incomeDto.getMaintenanceCost()
                         .add(row.getRepairFee()));
-                //月保费用
-                incomeDto.setInstrumentInsuranceCost(incomeDto.getInstrumentInsuranceCost()
-                        .add(row.getMaintenanceFee()));
                 //其他服务收入
                 incomeDto.setOtherServiceIncome(incomeDto.getOtherServiceIncome()
                         .add(row.getLeaseFee())
@@ -2570,6 +2562,16 @@ public class ExportServiceImpl implements ExportService {
                     incomeDto.setGroupPurchaseTeachingAids(incomeDto.getGroupPurchaseTeachingAids()
                             .add(row.getTeachingFee()));
                 }
+                //区分零售月保
+                if(row.getGroupType() == GroupType.MAINTENANCE){
+                    //零售月保,计入其他
+                    incomeDto.setOtherIncome(incomeDto.getOtherIncome()
+                            .add(row.getMaintenanceFee()));
+                }else {
+                    //团购月保
+                    incomeDto.setInstrumentInsuranceCost(incomeDto.getInstrumentInsuranceCost()
+                            .add(row.getMaintenanceFee()));
+                }
 
                 //大件乐器
                 incomeDto.setLargeInstruments(incomeDto.getLargeInstruments()
@@ -2585,12 +2587,14 @@ public class ExportServiceImpl implements ExportService {
                     .add(incomeDto.getMaintenanceCost())
                     .add(incomeDto.getInstrumentInsuranceCost())
                     .add(incomeDto.getOtherServiceIncome())
+                    .add(incomeDto.getCloudCoachIncome())
             );
             incomeDto.setSalesIncome(incomeDto.getSalesIncome()
-                    .add(incomeDto.getCloudCoachIncome())
+                    .add(incomeDto.getSaleCloudCoachIncome())
                     .add(incomeDto.getGroupPurchaseInstruments())
                     .add(incomeDto.getGroupPurchaseTeachingAids())
                     .add(incomeDto.getLargeInstruments())
+                    .add(incomeDto.getOtherIncome())
             );
             incomeDtos.add(incomeDto);
         }

mec-biz/src/main/resources/config/mybatis/OperatingReportNewMapper.xml

@@ -404,7 +404,7 @@
 		from financial_expenditure fe
 				 left join organization o ON o.id_ = fe.organ_id_
 				 left join cooperation_organ co ON co.id_ = fe.cooperation_organ_id_
-		where fe.process_id_ IN (19,22,28,51) AND fe.del_flag_ = 0 AND DATE_FORMAT(fe.aproval_time_, '%Y-%m') = #{month}
+		where fe.process_id_ IN (19,22,28,51) AND type_ NOT IN (1,2,13,14) AND fe.del_flag_ = 0 AND DATE_FORMAT(fe.aproval_time_, '%Y-%m') = #{month}
 		order by fe.id_ DESC
 	</select>
 	<select id="sumHumanCost" resultType="com.ym.mec.biz.dal.dto.HumanTypeDto">