diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java index 44880371..3791c189 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java @@ -243,6 +243,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService getTaskTypeParam(Long teacherOpenCourseId) { - return teacherOpenCourseHandsOnService.getTaskTypeParam(teacherOpenCourseId); + public JsonResult> getTaskTypeParam(Long teacherOpenCourseId) { + return JsonResult.success(teacherOpenCourseHandsOnService.getTaskTypeParam(teacherOpenCourseId)); } - /** * 实操删除 * @param ids diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointController.java index 9706da85..7446bcef 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointController.java @@ -78,6 +78,43 @@ public class TeacherOpenCourseKnowledgePointController{ } } + /** + * 添加修改都用这一个 根据teacherOpenCourseKnowledgePointId是否存在判断是添加还是修改 + * @param teacherOpenCourseKnowledgePointQuery + * @param result + * @param coreUser + * @return + */ + @PostMapping(API + "/add.do") + public JsonResult addApi(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseKnowledgePointQuery teacherOpenCourseKnowledgePointQuery, BindingResult result,@SCoreUser CoreUser coreUser){ + if(result.hasErrors()){ + return JsonResult.failMessage(result); + }else{ + if(teacherOpenCourseKnowledgePointQuery.getTeacherOpenCourseKnowledgePointId() == null){ + teacherOpenCourseKnowledgePointQuery.setUserId(coreUser.getId()); + teacherOpenCourseKnowledgePointQuery.setOrgId(coreUser.getOrgId()); + teacherOpenCourseKnowledgePointQuery.setCreateTime(new Date()); + teacherOpenCourseKnowledgePointQuery.setDelFlag(0); + return teacherOpenCourseKnowledgePointService.add(teacherOpenCourseKnowledgePointQuery); + }else { + teacherOpenCourseKnowledgePointQuery.setUserId(null); + teacherOpenCourseKnowledgePointQuery.setOrgId(null); + String msg = teacherOpenCourseKnowledgePointService.edit(teacherOpenCourseKnowledgePointQuery); + if (StringUtils.isBlank(msg)) { + return JsonResult.success(); + } else { + return JsonResult.failMessage("更新失败,"+msg); + } + } + } + } + + @PostMapping(API + "/delete.do") + @ResponseBody + public JsonResult deleteApi(String ids) { + teacherOpenCourseKnowledgePointService.deleteTeacherOpenCourseKnowledgePoint(ids); + return JsonResult.success(); + } /* 后台页面 */