zouxuan 2 years ago
parent
commit
c659339851

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

@@ -168,6 +168,7 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 					.add(humanTypeDto.getCommission())
 					.add(humanTypeDto.getCommission())
 					.add(humanTypeDto.getTax())
 					.add(humanTypeDto.getTax())
 					.add(humanTypeDto.getNetworkClassroomCost())
 					.add(humanTypeDto.getNetworkClassroomCost())
+					.add(humanTypeDto.getCloudCoachingCost())
 					.add(humanTypeDto.getStudentManagementFeeAdjustment()));
 					.add(humanTypeDto.getStudentManagementFeeAdjustment()));
 			//固定费用
 			//固定费用
 			operatingReportNew.setFixedCosts(getAmount(collect8.get(organId)).add(humanTypeDto.getFixedCost()));
 			operatingReportNew.setFixedCosts(getAmount(collect8.get(organId)).add(humanTypeDto.getFixedCost()));

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

@@ -422,7 +422,9 @@
 			SUM(CASE WHEN human_cost_type_ = 'NETWORK_CLASSROOM' THEN amount_ ELSE 0 END) AS networkClassroomCost,
 			SUM(CASE WHEN human_cost_type_ = 'NETWORK_CLASSROOM' THEN amount_ ELSE 0 END) AS networkClassroomCost,
 			SUM(CASE WHEN human_cost_type_ = 'CLOUD_COACHING_COST' THEN amount_ ELSE 0 END) AS cloudCoachingCost,
 			SUM(CASE WHEN human_cost_type_ = 'CLOUD_COACHING_COST' THEN amount_ ELSE 0 END) AS cloudCoachingCost,
 			SUM(CASE WHEN human_cost_type_ = 'INTERNAL_SETTLEMENT' THEN amount_ ELSE 0 END) AS internalSettlement,
 			SUM(CASE WHEN human_cost_type_ = 'INTERNAL_SETTLEMENT' THEN amount_ ELSE 0 END) AS internalSettlement,
-			SUM(CASE WHEN human_cost_type_ = 'STUDENT_MANAGEMENT_FEE_ADJUSTMENT' THEN amount_ ELSE 0 END) AS studentManagementFeeAdjustment
+			SUM(CASE WHEN human_cost_type_ = 'STUDENT_MANAGEMENT_FEE_ADJUSTMENT' THEN amount_ ELSE 0 END) AS studentManagementFeeAdjustment,
+			SUM(CASE WHEN human_cost_type_ = 'COMMISSION' THEN amount_ ELSE 0 END) AS commission,
+			SUM(CASE WHEN human_cost_type_ = 'TAX' THEN amount_ ELSE 0 END) AS tax
 		from human_cost
 		from human_cost
 		where month_ = #{month} group by organ_id_
 		where month_ = #{month} group by organ_id_
 	</select>
 	</select>