jiangjiazhi / regional-platform

Authored by liquanyu about 7 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 71 additions and 4 deletions

...	...	@@ -87,7 +87,7 @@
87	87	}
88	88
89	89	if (null != courseName) {
90		- condition = condition.and("courseName", courseName, MongoOper.LIKE);
	90	+ condition = condition.and("courseName", courseName, MongoOper.IS);
91	91	}
92	92
93	93

...	...	@@ -66,7 +66,7 @@
66	66	HttpServletRequest request) {
67	67
68	68	return courseFacade.getCoureseList(null, 2, null, null,
69		- null, null, null, null, getUserId(request),null);
	69	+ null, null, null, null, getUserId(request), null);
70	70	}
71	71
72	72
...	...	@@ -143,6 +143,20 @@
143	143	@TokenRequired
144	144	public BaseResponse publishCourese(HttpServletRequest request, @PathVariable(value = "id") String id) {
145	145	return courseFacade.publishCourese(id);
	146	+ }
	147	+
	148	+
	149	+ /**
	150	+ * 验证课程名称是否重复
	151	+ * @param request
	152	+ * @param courseName
	153	+ * @return
	154	+ */
	155	+ @RequestMapping(method = RequestMethod.GET, value = "/validateCourseName")
	156	+ @ResponseBody
	157	+ @TokenRequired
	158	+ public BaseResponse validateCourseName(HttpServletRequest request, @RequestParam(required = true) String courseName) {
	159	+ return courseFacade.validateCourseName(courseName,getUserId(request));
146	160	}
147	161	}

...	...	@@ -51,7 +51,7 @@
51	51	@TokenRequired
52	52	public BaseResponse updateCoureseType(@RequestBody CourseTypeRequest model,
53	53	HttpServletRequest request) {
54		- return courseTypeFacade.updateCoureseType(model,getUserId(request));
	54	+ return courseTypeFacade.updateCoureseType(model, getUserId(request));
55	55	}
56	56
57	57
...	...	@@ -65,6 +65,20 @@
65	65	@TokenRequired
66	66	public BaseResponse getCoureseTypeList(HttpServletRequest request) {
67	67	return courseTypeFacade.getCoureseTypeList(getUserId(request), null);
	68	+ }
	69	+
	70	+
	71	+
	72	+ /**
	73	+ * 课程类型名称是否重复验证
	74	+ * @param request
	75	+ * @return
	76	+ */
	77	+ @RequestMapping(method = RequestMethod.GET, value = "/validateCourseTypeName")
	78	+ @ResponseBody
	79	+ @TokenRequired
	80	+ public BaseResponse validateCourseTypeName(@RequestParam(required = true) String courseTypeName,HttpServletRequest request) {
	81	+ return courseTypeFacade.validateCourseTypeName(getUserId(request),courseTypeName);
68	82	}
69	83
70	84

...	...	@@ -284,7 +284,7 @@
284	284	courseService.updateCourse(model);
285	285
286	286	String hospitalId = autoMatchFacade.getHospitalId(userId);
287		- operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), updateModel,model, OptActionEnums.UPDATE.getId(), "修改课程");
	287	+ operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), updateModel, model, OptActionEnums.UPDATE.getId(), "修改课程");
288	288	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
289	289	objectResponse.setErrormsg("成功");
290	290	return objectResponse;
...	...	@@ -309,6 +309,26 @@
309	309	courseService.updateCourse(model);
310	310	}
311	311	}
	312	+ }
	313	+
	314	+ public BaseResponse validateCourseName(String courseName, Integer userId) {
	315	+
	316	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	317	+ CourseQuery query = new CourseQuery();
	318	+ query.setYn(YnEnums.YES.getId());
	319	+ query.setCourseName(courseName);
	320	+ query.setHospitalId(hospitalId);
	321	+ BaseResponse objectResponse = new BaseResponse();
	322	+ List<CourseModel> courseModels = courseService.queryCourseList(query);
	323	+ if (CollectionUtils.isNotEmpty(courseModels))
	324	+ {
	325	+ objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
	326	+ objectResponse.setErrormsg("该课程名称已经存在");
	327	+ return objectResponse;
	328	+ }
	329	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	330	+ objectResponse.setErrormsg("成功");
	331	+ return objectResponse;
312	332	}
313	333	}

...	...	@@ -166,5 +166,24 @@
166	166	objectResponse.setErrormsg("成功");
167	167	return objectResponse;
168	168	}
	169	+
	170	+ public BaseResponse validateCourseTypeName(Integer userId,String courseTypeName) {
	171	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	172	+ CourseTypeQuery query = new CourseTypeQuery();
	173	+ query.setHospitalId(hospitalId);
	174	+ query.setYn(YnEnums.YES.getId());
	175	+ query.setCourseTypeName(courseTypeName);
	176	+ BaseResponse objectResponse = new BaseResponse();
	177	+ List<CourseTypeModel> typeModels = courseTypeService.queryCourseTypeList(query);
	178	+ if (CollectionUtils.isNotEmpty(typeModels))
	179	+ {
	180	+ objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
	181	+ objectResponse.setErrormsg("该课程类型名称已经存在");
	182	+ return objectResponse;
	183	+ }
	184	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	185	+ objectResponse.setErrormsg("成功");
	186	+ return objectResponse;
	187	+ }
169	188	}