From 126cf8b3cf05648592ec7b1d745f0a0f7f270b0c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 28 Feb 2018 14:20:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=AD=A6=E6=A0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/CourseController.java | 5 ++-- .../web/controller/CourseTypeController.java | 6 +++-- .../platform/operate/web/facade/CourseFacade.java | 26 +++++++++++++++++---- .../operate/web/facade/CourseTypeFacade.java | 27 ++++++++++++++++++---- 4 files changed, 52 insertions(+), 12 deletions(-) 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 f391d45..2fecd7b 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 @@ -155,7 +155,8 @@ public class CourseController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/validateCourseName") @ResponseBody @TokenRequired - public BaseResponse validateCourseName(HttpServletRequest request, @RequestParam(required = true) String courseName) { - return courseFacade.validateCourseName(courseName,getUserId(request)); + public BaseResponse validateCourseName(HttpServletRequest request, @RequestParam(required = true) String courseName + , @RequestParam(required = false) String courseId) { + return courseFacade.validateCourseName(courseName,getUserId(request),courseId); } } 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 9a421d0..aa9b495 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 @@ -77,8 +77,10 @@ public class CourseTypeController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/validateCourseTypeName") @ResponseBody @TokenRequired - public BaseResponse validateCourseTypeName(@RequestParam(required = true) String courseTypeName,HttpServletRequest request) { - return courseTypeFacade.validateCourseTypeName(getUserId(request),courseTypeName); + public BaseResponse validateCourseTypeName(@RequestParam(required = true) String courseTypeName, + @RequestParam(required = false) String courseTypeId, + HttpServletRequest request) { + return courseTypeFacade.validateCourseTypeName(getUserId(request),courseTypeName,courseTypeId); } 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 30bd475..171ab93 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 @@ -311,20 +311,38 @@ public class CourseFacade { } } - public BaseResponse validateCourseName(String courseName, Integer userId) { + public BaseResponse validateCourseName(String courseName, Integer userId,String courseId) { String hospitalId = autoMatchFacade.getHospitalId(userId); CourseQuery query = new CourseQuery(); query.setYn(YnEnums.YES.getId()); query.setCourseName(courseName); query.setHospitalId(hospitalId); + query.setId(courseId); BaseResponse objectResponse = new BaseResponse(); List courseModels = courseService.queryCourseList(query); if (CollectionUtils.isNotEmpty(courseModels)) { - objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); - objectResponse.setErrormsg("该课程名称已经存在"); - return objectResponse; + if (StringUtils.isNotEmpty(courseId)) + { + for (CourseModel model : courseModels) + { + if (!model.getId().equals(courseId)) + { + objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); + objectResponse.setErrormsg("该课程名称已经存在"); + return objectResponse; + } + + } + } + else + { + objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); + objectResponse.setErrormsg("该课程名称已经存在"); + return objectResponse; + } + } objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); 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 5fa1f12..3f54696 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 @@ -167,7 +167,7 @@ public class CourseTypeFacade { return objectResponse; } - public BaseResponse validateCourseTypeName(Integer userId,String courseTypeName) { + public BaseResponse validateCourseTypeName(Integer userId,String courseTypeName,String courseTypeId) { String hospitalId = autoMatchFacade.getHospitalId(userId); CourseTypeQuery query = new CourseTypeQuery(); query.setHospitalId(hospitalId); @@ -177,9 +177,28 @@ public class CourseTypeFacade { List typeModels = courseTypeService.queryCourseTypeList(query); if (CollectionUtils.isNotEmpty(typeModels)) { - objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); - objectResponse.setErrormsg("该课程类型名称已经存在"); - return objectResponse; + + if (StringUtils.isNotEmpty(courseTypeId)) + { + for (CourseTypeModel model : typeModels) + { + if (!model.getId().equals(courseTypeId)) + { + objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); + objectResponse.setErrormsg("该课程类型名称已经存在"); + return objectResponse; + } + + } + } + else + { + objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); + objectResponse.setErrormsg("该课程类型名称已经存在"); + return objectResponse; + } + + } objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); -- 1.8.3.1