jiangjiazhi / regional-platform

Authored by liquanyu over 9 years ago

Exists in master and in 8 other branches

Showing 4 changed files with 45 additions and 14 deletions

...	...	@@ -150,16 +150,30 @@
150	150	}
151	151
152	152
153		-
154		-
155	153	/**
156		- * 查询儿童记录
157		- * @param request
	154	+ * 查询儿童管理页面
	155	+ * @param mcardNo
	156	+ * @param page
	157	+ * @param limit
	158	+ * @param serviceStatus
	159	+ * @param name
158	160	* @return
159	161	*/
160		- @RequestMapping(value = "/queryBabyList", method = RequestMethod.POST)
	162	+ @RequestMapping(value = "/queryBabyList", method = RequestMethod.GET)
161	163	@ResponseBody
162		- public BaseListResponse queryBabyList(@RequestBody BabyManageRequest request){
	164	+ public BaseListResponse queryBabyList(@RequestParam(value = "mcardNo", required = false) String mcardNo,
	165	+ @RequestParam("page") Integer page,
	166	+ @RequestParam("limit") Integer limit,
	167	+ @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus,
	168	+ @RequestParam(value = "name", required = false) String name){
	169	+
	170	+ BabyManageRequest request = new BabyManageRequest();
	171	+ request.setMcardNo(mcardNo);
	172	+ request.setServiceStatus(serviceStatus);
	173	+ request.setName(request.getName());
	174	+ request.setLimit(limit);
	175	+ request.setPage(page);
	176	+
163	177	return babyBookbuildingFacade.queryBabyList(request);
164	178	}
165	179

...	...	@@ -53,12 +53,26 @@
53	53
54	54	/**
55	55	* 根据条件查询短信模板列表
56		- * @param request
57	56	* @return
58	57	*/
59		- @RequestMapping(method = RequestMethod.POST, value = "/querySmsTempList")
	58	+ @RequestMapping(method = RequestMethod.GET, value = "/querySmsTempList")
60	59	@ResponseBody
61		- public BaseListResponse querySmsTemps(@RequestBody SmsTemplateRequest request) {
	60	+ public BaseListResponse querySmsTemps(@RequestParam(value = "serviceObj", required = false) Integer serviceObj,
	61	+ @RequestParam("page") Integer page,
	62	+ @RequestParam("limit") Integer limit,
	63	+ @RequestParam(value = "serviceType", required = false) Integer serviceType,
	64	+ @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus,
	65	+ @RequestParam(value = "smsType", required = false) Integer smsType,
	66	+ @RequestParam(value = "content", required = false) String content) {
	67	+
	68	+ SmsTemplateRequest request = new SmsTemplateRequest();
	69	+ request.setServiceObj(serviceObj);
	70	+ request.setContent(content);
	71	+ request.setServiceType(serviceType);
	72	+ request.setSmsType(smsType);
	73	+ request.setServiceStatus(serviceStatus);
	74	+ request.setLimit(limit);
	75	+ request.setPage(page);
62	76	return smsTemplateFacade.querySmsTemps(request);
63	77	}
64	78

...	...	@@ -639,9 +639,10 @@
639	639	BabyModelQuery babyQuery = new BabyModelQuery();
640	640	babyQuery.setYn(YnEnums.YES.getId());
641	641	babyQuery.setMcertNo(request.getMcardNo());
642		- babyQuery.setCardNo(request.getBcardNo());
	642	+ babyQuery.setServiceStatus(request.getServiceStatus());
643	643	babyQuery.setName(request.getName());
644	644	babyQuery.setNeed("1");
	645	+
645	646
646	647	babyQuery.setPage(request.getPage());
647	648	babyQuery.setLimit(request.getLimit());

...	...	@@ -152,16 +152,18 @@
152	152	SmsTemplateQuery query = new SmsTemplateQuery();
153	153	query.setYn(YnEnums.YES.getId());
154	154	query.setNeed("1");
	155	+ query.setLimit(request.getLimit());
	156	+ query.setPage(request.getPage());
155	157	if (request.getServiceObj() != null && request.getServiceObj() == 0)
156	158	{
157	159	//查询全部
158	160	request.setServiceObj(null);
159	161	}
160	162
161		-// if (request.getSmsType() != null && request.getSmsType() == 0)
162		-// {
163		-//
164		-// }
	163	+ if (request.getSmsType() != null && request.getSmsType() == 0)
	164	+ {
	165	+ request.setSmsType(null);
	166	+ }
165	167	if (request.getServiceType() != null && request.getServiceType() == 100)
166	168	{
167	169	request.setServiceType(null);