jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 31 additions and 2 deletions

...	...	@@ -70,6 +70,23 @@
70	70	null, null, null, null, getUserId(request), null);
71	71	}
72	72
	73	+ /**
	74	+ * 小程序获取可以签到的列表
	75	+ * @param hospitalId
	76	+ * @param request
	77	+ * @return
	78	+ */
	79	+ @RequestMapping(method = RequestMethod.GET, value = "/getAppYfbCoureseList")
	80	+ @ResponseBody
	81	+ @TokenRequired
	82	+ public BaseResponse getAppYfbCoureseList(
	83	+ @RequestParam(required = false) String hospitalId,
	84	+ HttpServletRequest request) {
	85	+
	86	+ return courseFacade.getCoureseListResp(null, 2, null, null,
	87	+ null, null, null, null, null, hospitalId);
	88	+ }
	89	+
73	90
74	91
75	92	/**

...	...	@@ -114,11 +114,22 @@
114	114	return model;
115	115	}
116	116
117		- public BaseResponse getCoureseList(String courseTypeId, Integer status,String courseName,String courseSpeaker,
	117	+ public BaseResponse getCoureseList(String courseTypeId, Integer status,
	118	+ String courseName,String courseSpeaker,
118	119	String createdTime, String courseTime,
119		- Integer page, Integer limit, Integer userId,String isPage) {
	120	+ Integer page, Integer limit,
	121	+ Integer userId,String isPage) {
120	122
121	123	String hospitalId = autoMatchFacade.getHospitalId(userId);
	124	+ BaseListResponse objectResponse = getCoureseListResp(courseTypeId, status, courseName, courseSpeaker, createdTime, courseTime, page, limit, isPage, hospitalId);
	125	+ return objectResponse;
	126	+ }
	127	+
	128	+ public BaseListResponse getCoureseListResp(String courseTypeId, Integer status,
	129	+ String courseName, String courseSpeaker,
	130	+ String createdTime, String courseTime,
	131	+ Integer page, Integer limit,
	132	+ String isPage, String hospitalId) {
122	133	List<CourseResult> results = new ArrayList<>();
123	134	CourseQuery query = new CourseQuery();
124	135

...	...	@@ -544,6 +544,7 @@
544	544	}
545	545
546	546	result.put("hospitalName",hospitalName);
	547	+ result.put("hospitalId",model.getHospitalId());
547	548	//报名人数
548	549	result.put("enrolmentNum", model.getEnrolmentNum() == null ? "0" : String.valueOf(model.getEnrolmentNum()));
549	550