zouxuan vor 2 Jahren
Ursprung
Commit
17f2c819b5

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/HumanTypeDto.java

@@ -13,4 +13,6 @@ public class HumanTypeDto {
     private BigDecimal cloudCoachingCost = BigDecimal.ZERO; // 云教练成本
     private BigDecimal internalSettlement = BigDecimal.ZERO; // 内部结算
     private BigDecimal studentManagementFeeAdjustment = BigDecimal.ZERO; // 学员管理费调整
+    private BigDecimal commission = BigDecimal.ZERO; // 手续费
+    private BigDecimal tax = BigDecimal.ZERO; // 税费
 }

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/OperatingReportNewServiceImpl.java

@@ -165,6 +165,8 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 			//变动费用
 			operatingReportNew.setVariableCosts(getAmount(collect7.get(organId))
 					.add(humanTypeDto.getVariableCost())
+					.add(humanTypeDto.getCommission())
+					.add(humanTypeDto.getTax())
 					.add(humanTypeDto.getNetworkClassroomCost())
 					.add(humanTypeDto.getStudentManagementFeeAdjustment()));
 			//固定费用