|
@@ -8,6 +8,7 @@ import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
import com.qmth.teachcloud.common.entity.BasicCourse;
|
|
import com.qmth.teachcloud.common.entity.BasicCourse;
|
|
import com.qmth.teachcloud.common.entity.SysUser;
|
|
import com.qmth.teachcloud.common.entity.SysUser;
|
|
|
|
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
import com.qmth.teachcloud.common.service.BasicCourseService;
|
|
import com.qmth.teachcloud.common.service.BasicCourseService;
|
|
import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
|
|
import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
|
|
import com.qmth.teachcloud.common.util.JacksonUtil;
|
|
import com.qmth.teachcloud.common.util.JacksonUtil;
|
|
@@ -117,6 +118,8 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
|
|
obeCourseRequirementReportService.save(obeCourseRequirementReport);
|
|
obeCourseRequirementReportService.save(obeCourseRequirementReport);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } else {
|
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("报告生成失败,请先完善培养方案");
|
|
}
|
|
}
|
|
return obeCourseRequirementResultDto;
|
|
return obeCourseRequirementResultDto;
|
|
}
|
|
}
|
|
@@ -264,6 +267,9 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if (CollectionUtils.isEmpty(obeCourseRequirementDtoList)) {
|
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("报告生成失败,请先完成当前方案下课程目标达成度计算");
|
|
|
|
+ }
|
|
resultMap.put(SystemConstant.OBE_COURSE_REQUIREMENT_DTO_LIST, obeCourseRequirementDtoList);
|
|
resultMap.put(SystemConstant.OBE_COURSE_REQUIREMENT_DTO_LIST, obeCourseRequirementDtoList);
|
|
resultMap.put(SystemConstant.OBE_SUB_REQUIREMENT_DTO_MAP, obeSubRequirementsDtoMap);
|
|
resultMap.put(SystemConstant.OBE_SUB_REQUIREMENT_DTO_MAP, obeSubRequirementsDtoMap);
|
|
return resultMap;
|
|
return resultMap;
|