课时统计

src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeStatisticsServiceImpl.java

@@ -331,14 +331,8 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                 }else{//外聘FB1605、合作人员FB1609
                     zzxCost = BigDecimal.valueOf(costSetMap.get("cost2"));
                 }
-                double classTime = classTime7
-                        + (record.getClassTime1() == null ? 0d:record.getClassTime1())
-                        + (record.getClassTime2() == null ? 0d:record.getClassTime2())
-                        + (record.getClassTime3() == null ? 0d:record.getClassTime3())
-                        + (record.getClassTime4() == null ? 0d:record.getClassTime4())
-                        + (record.getClassTime5() == null ? 0d:record.getClassTime5())
-                        + (record.getClassTime6() == null ? 0d:record.getClassTime6());
-                classTimeAmount += BigDecimal.valueOf(classTime).multiply(zzxCost).doubleValue();
+
+                classTimeAmount += BigDecimal.valueOf(classTime7).multiply(zzxCost).doubleValue();
 
                 BigDecimal zkCost = BigDecimal.ZERO;//正课费用
                 if("FB1601".equals(teacher.getEmployType())){
@@ -346,7 +340,15 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                 }else{//外聘FB1605、合作人员FB1609
                     zkCost = BigDecimal.valueOf(costSetMap.get("cost4"));
                 }
-                classTimeAmount += BigDecimal.valueOf(classTime8).multiply(zkCost).doubleValue();
+
+                double classTime = classTime8
+                        + (record.getClassTime1() == null ? 0d:record.getClassTime1())
+                        + (record.getClassTime2() == null ? 0d:record.getClassTime2())
+                        + (record.getClassTime3() == null ? 0d:record.getClassTime3())
+                        + (record.getClassTime4() == null ? 0d:record.getClassTime4())
+                        + (record.getClassTime5() == null ? 0d:record.getClassTime5())
+                        + (record.getClassTime6() == null ? 0d:record.getClassTime6());
+                classTimeAmount += BigDecimal.valueOf(classTime).multiply(zkCost).doubleValue();
 
                 BigDecimal wzxCost = BigDecimal.ZERO;//晚自习费用
                 if("FB1601".equals(teacher.getEmployType())){