jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 52 additions and 12 deletions

...	...	@@ -155,8 +155,9 @@
155	155	@RequestMapping(method = RequestMethod.GET, value = "/validateCourseName")
156	156	@ResponseBody
157	157	@TokenRequired
158		- public BaseResponse validateCourseName(HttpServletRequest request, @RequestParam(required = true) String courseName) {
159		- return courseFacade.validateCourseName(courseName,getUserId(request));
	158	+ public BaseResponse validateCourseName(HttpServletRequest request, @RequestParam(required = true) String courseName
	159	+ , @RequestParam(required = false) String courseId) {
	160	+ return courseFacade.validateCourseName(courseName,getUserId(request),courseId);
160	161	}
161	162	}

...	...	@@ -77,8 +77,10 @@
77	77	@RequestMapping(method = RequestMethod.GET, value = "/validateCourseTypeName")
78	78	@ResponseBody
79	79	@TokenRequired
80		- public BaseResponse validateCourseTypeName(@RequestParam(required = true) String courseTypeName,HttpServletRequest request) {
81		- return courseTypeFacade.validateCourseTypeName(getUserId(request),courseTypeName);
	80	+ public BaseResponse validateCourseTypeName(@RequestParam(required = true) String courseTypeName,
	81	+ @RequestParam(required = false) String courseTypeId,
	82	+ HttpServletRequest request) {
	83	+ return courseTypeFacade.validateCourseTypeName(getUserId(request),courseTypeName,courseTypeId);
82	84	}
83	85
84	86

...	...	@@ -311,20 +311,38 @@
311	311	}
312	312	}
313	313
314		- public BaseResponse validateCourseName(String courseName, Integer userId) {
	314	+ public BaseResponse validateCourseName(String courseName, Integer userId,String courseId) {
315	315
316	316	String hospitalId = autoMatchFacade.getHospitalId(userId);
317	317	CourseQuery query = new CourseQuery();
318	318	query.setYn(YnEnums.YES.getId());
319	319	query.setCourseName(courseName);
320	320	query.setHospitalId(hospitalId);
	321	+ query.setId(courseId);
321	322	BaseResponse objectResponse = new BaseResponse();
322	323	List<CourseModel> courseModels = courseService.queryCourseList(query);
323	324	if (CollectionUtils.isNotEmpty(courseModels))
324	325	{
325		- objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
326		- objectResponse.setErrormsg("该课程名称已经存在");
327		- return objectResponse;
	326	+ if (StringUtils.isNotEmpty(courseId))
	327	+ {
	328	+ for (CourseModel model : courseModels)
	329	+ {
	330	+ if (!model.getId().equals(courseId))
	331	+ {
	332	+ objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
	333	+ objectResponse.setErrormsg("该课程名称已经存在");
	334	+ return objectResponse;
	335	+ }
	336	+
	337	+ }
	338	+ }
	339	+ else
	340	+ {
	341	+ objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
	342	+ objectResponse.setErrormsg("该课程名称已经存在");
	343	+ return objectResponse;
	344	+ }
	345	+
328	346	}
329	347	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
330	348	objectResponse.setErrormsg("成功");

...	...	@@ -167,7 +167,7 @@
167	167	return objectResponse;
168	168	}
169	169
170		- public BaseResponse validateCourseTypeName(Integer userId,String courseTypeName) {
	170	+ public BaseResponse validateCourseTypeName(Integer userId,String courseTypeName,String courseTypeId) {
171	171	String hospitalId = autoMatchFacade.getHospitalId(userId);
172	172	CourseTypeQuery query = new CourseTypeQuery();
173	173	query.setHospitalId(hospitalId);
...	...	@@ -177,9 +177,28 @@
177	177	List<CourseTypeModel> typeModels = courseTypeService.queryCourseTypeList(query);
178	178	if (CollectionUtils.isNotEmpty(typeModels))
179	179	{
180		- objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
181		- objectResponse.setErrormsg("该课程类型名称已经存在");
182		- return objectResponse;
	180	+
	181	+ if (StringUtils.isNotEmpty(courseTypeId))
	182	+ {
	183	+ for (CourseTypeModel model : typeModels)
	184	+ {
	185	+ if (!model.getId().equals(courseTypeId))
	186	+ {
	187	+ objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
	188	+ objectResponse.setErrormsg("该课程类型名称已经存在");
	189	+ return objectResponse;
	190	+ }
	191	+
	192	+ }
	193	+ }
	194	+ else
	195	+ {
	196	+ objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
	197	+ objectResponse.setErrormsg("该课程类型名称已经存在");
	198	+ return objectResponse;
	199	+ }
	200	+
	201	+
183	202	}
184	203	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
185	204	objectResponse.setErrormsg("成功");