提交 5d8d55c0 authored 作者: liupengfei's avatar liupengfei

解决 添加关联基础教学计划 NullPointException

上级 9606c49a
......@@ -53,7 +53,7 @@ public class FgPublicLessonClassArrangeRealtionServiceImpl extends BaseServiceIm
entity.setMaterialId(id);
entity.setSemester(vo.getSemester());
entity.setWeeklyHours(vo.getWeeklyHours());
if(vo.getSemester() % 2 == 0){
if(vo.getSemester() != null && vo.getSemester() % 2 == 0){
entity.setWeek(school.getSpringWeek());
}else{
entity.setWeek(school.getAutumnWeek());
......
......@@ -224,6 +224,11 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
}
public boolean check(FgSavePublicLeesonForm form,School school,List<PublicLessonClassArrangeRealtion> list){
boolean isNull = list.stream().allMatch(v -> v == null || v.getSemester() == null || v.getWeeklyHours() == null);
if (isNull) {
return true;
}
//理论课时和实训课时之和
int count = form.getTheoryClassHour().intValue() + form.getTrainingHours().intValue();
//课时安排总课时
......@@ -233,6 +238,15 @@ public class FgPublicLessonServiceImpl extends BaseModelServiceImpl<PublicLesson
throw new BusinessValidateException("请前往学校信息管理页面补全学校信息");
}
for(int i = 0; i < list.size(); i++){
if (list.get(i) == null) {
continue;
}
if (list.get(i).getSemester() == null) {
list.get(i).setSemester(0);
}
if (list.get(i).getWeeklyHours() == null) {
list.get(i).setWeeklyHours(0);
}
if(list.get(i).getSemester().intValue()%2 == 0){
num = list.get(i).getWeeklyHours().intValue() * school.getSpringWeek();
}
......
......@@ -273,6 +273,7 @@ public class SplitOrderServiceImpl extends BaseModelServiceImpl<SplitOrder, Inte
fgOrderService.saveOrder(order);
} catch (Exception e) {
log.debug("分单保存订单失败");
e.printStackTrace();
throw new RuntimeException(e);
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论