diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java index 3a00628..5b4b8b0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java @@ -87,7 +87,7 @@ public class CourseQuery extends BaseQuery implements IConvertToNativeQuery { } if (null != courseName) { - condition = condition.and("courseName", courseName, MongoOper.LIKE); + condition = condition.and("courseName", courseName, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java index 1124fea..f391d45 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java @@ -66,7 +66,7 @@ public class CourseController extends BaseController { HttpServletRequest request) { return courseFacade.getCoureseList(null, 2, null, null, - null, null, null, null, getUserId(request),null); + null, null, null, null, getUserId(request), null); } @@ -144,4 +144,18 @@ public class CourseController extends BaseController { public BaseResponse publishCourese(HttpServletRequest request, @PathVariable(value = "id") String id) { return courseFacade.publishCourese(id); } + + + /** + * 验证课程名称是否重复 + * @param request + * @param courseName + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/validateCourseName") + @ResponseBody + @TokenRequired + public BaseResponse validateCourseName(HttpServletRequest request, @RequestParam(required = true) String courseName) { + return courseFacade.validateCourseName(courseName,getUserId(request)); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseTypeController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseTypeController.java index 79b472c..9a421d0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseTypeController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseTypeController.java @@ -51,7 +51,7 @@ public class CourseTypeController extends BaseController { @TokenRequired public BaseResponse updateCoureseType(@RequestBody CourseTypeRequest model, HttpServletRequest request) { - return courseTypeFacade.updateCoureseType(model,getUserId(request)); + return courseTypeFacade.updateCoureseType(model, getUserId(request)); } @@ -68,6 +68,20 @@ public class CourseTypeController extends BaseController { } + + /** + * 课程类型名称是否重复验证 + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/validateCourseTypeName") + @ResponseBody + @TokenRequired + public BaseResponse validateCourseTypeName(@RequestParam(required = true) String courseTypeName,HttpServletRequest request) { + return courseTypeFacade.validateCourseTypeName(getUserId(request),courseTypeName); + } + + /** * 查询单个类型 * @param request diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index 14773a1..30bd475 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -284,7 +284,7 @@ public class CourseFacade { courseService.updateCourse(model); String hospitalId = autoMatchFacade.getHospitalId(userId); - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), updateModel,model, OptActionEnums.UPDATE.getId(), "修改课程"); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), updateModel, model, OptActionEnums.UPDATE.getId(), "修改课程"); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); return objectResponse; @@ -310,4 +310,24 @@ public class CourseFacade { } } } + + public BaseResponse validateCourseName(String courseName, Integer userId) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); + CourseQuery query = new CourseQuery(); + query.setYn(YnEnums.YES.getId()); + query.setCourseName(courseName); + query.setHospitalId(hospitalId); + BaseResponse objectResponse = new BaseResponse(); + List courseModels = courseService.queryCourseList(query); + if (CollectionUtils.isNotEmpty(courseModels)) + { + objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); + objectResponse.setErrormsg("该课程名称已经存在"); + return objectResponse; + } + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseTypeFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseTypeFacade.java index a5c5fea..5fa1f12 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseTypeFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseTypeFacade.java @@ -166,4 +166,23 @@ public class CourseTypeFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + public BaseResponse validateCourseTypeName(Integer userId,String courseTypeName) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + CourseTypeQuery query = new CourseTypeQuery(); + query.setHospitalId(hospitalId); + query.setYn(YnEnums.YES.getId()); + query.setCourseTypeName(courseTypeName); + BaseResponse objectResponse = new BaseResponse(); + List typeModels = courseTypeService.queryCourseTypeList(query); + if (CollectionUtils.isNotEmpty(typeModels)) + { + objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); + objectResponse.setErrormsg("该课程类型名称已经存在"); + return objectResponse; + } + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } \ No newline at end of file