课时调整

src/main/java/com/xjrsoft/module/classtime/controller/ClassTimeStatisticsController.java

@@ -149,9 +149,10 @@ public class ClassTimeStatisticsController {
                         .eq(ClassTimeStatisticsSet::getCategory, category)
                         .orderByDesc(ClassTimeStatisticsSet::getCreateDate)
         );
-        if(!list.isEmpty()){
-            classTimeStatistics.setWeightSetJson(list.get(0).getJsonContent());
+        if(list.isEmpty()){
+            throw new MyException("请先设置权重并进行保存");
         }
+        classTimeStatistics.setWeightSetJson(list.get(0).getJsonContent());
 
         //查询最新费用并保存到统计中
         category = 2;
@@ -160,9 +161,10 @@ public class ClassTimeStatisticsController {
                         .eq(ClassTimeStatisticsSet::getCategory, category)
                         .orderByDesc(ClassTimeStatisticsSet::getCreateDate)
         );
-        if(!list.isEmpty()){
-            classTimeStatistics.setCostSetJson(list.get(0).getJsonContent());
+        if(list.isEmpty()){
+            throw new MyException("请先设置费用并进行保存");
         }
+        classTimeStatistics.setCostSetJson(list.get(0).getJsonContent());
         Boolean aBoolean = classTimeStatisticsService.updateById(classTimeStatistics);
 
 //        CompletableFuture.runAsync(() -> {

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

@@ -12,6 +12,7 @@ import com.google.gson.JsonParser;
 import com.xjrsoft.common.enums.CourseAdjustTypeEnum;
 import com.xjrsoft.common.enums.CourseTimeTypeEnum;
 import com.xjrsoft.common.enums.EnabledMark;
+import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.module.classtime.dto.AddClassTimeStatisticsDto;
 import com.xjrsoft.module.classtime.entity.ClassTimeDelete;
 import com.xjrsoft.module.classtime.entity.ClassTimeStatistics;
@@ -98,9 +99,10 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                         .eq(ClassTimeStatisticsSet::getCategory, category)
                         .orderByDesc(ClassTimeStatisticsSet::getCreateDate)
         );
-        if(!list.isEmpty()){
-            classTimeStatistics.setWeightSetJson(list.get(0).getJsonContent());
+        if(list.isEmpty()){
+            throw new MyException("请先设置权重并进行保存");
         }
+        classTimeStatistics.setWeightSetJson(list.get(0).getJsonContent());
 
         //查询最新费用并保存到统计中
         category = 2;
@@ -109,9 +111,10 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                         .eq(ClassTimeStatisticsSet::getCategory, category)
                         .orderByDesc(ClassTimeStatisticsSet::getCreateDate)
         );
-        if(!list.isEmpty()){
-            classTimeStatistics.setCostSetJson(list.get(0).getJsonContent());
+        if(list.isEmpty()){
+            throw new MyException("请先设置费用并进行保存");
         }
+        classTimeStatistics.setCostSetJson(list.get(0).getJsonContent());
         this.save(classTimeStatistics);
 
         CompletableFuture.runAsync(() -> {
@@ -349,9 +352,9 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
 
             BigDecimal bdkCost = BigDecimal.ZERO;//顶课费用，被顶课老师扣钱
             if("FB1601".equals(teacher.getEmployType())){
-                bdkCost = BigDecimal.valueOf(costSetMap.get("cost13"));
+                bdkCost = BigDecimal.valueOf(costSetMap.get("cost13")==null?0:costSetMap.get("cost13"));
             }else{//外聘FB1605、合作人员FB1609
-                bdkCost = BigDecimal.valueOf(costSetMap.get("cost14"));
+                bdkCost = BigDecimal.valueOf(costSetMap.get("cost14")==null?0:costSetMap.get("cost14"));
             }
             //计算被扣除的费用
             BigDecimal reduceTimeAmount = bdkCost.multiply(BigDecimal.valueOf(reduceTime));