diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java index d7fe5eb..ff3daa7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java @@ -150,16 +150,30 @@ public class BabyBookbuildingController extends BaseController{ } - - /** - * 查询儿童记录 - * @param request + * 查询儿童管理页面 + * @param mcardNo + * @param page + * @param limit + * @param serviceStatus + * @param name * @return */ - @RequestMapping(value = "/queryBabyList", method = RequestMethod.POST) + @RequestMapping(value = "/queryBabyList", method = RequestMethod.GET) @ResponseBody - public BaseListResponse queryBabyList(@RequestBody BabyManageRequest request){ + public BaseListResponse queryBabyList(@RequestParam(value = "mcardNo", required = false) String mcardNo, + @RequestParam("page") Integer page, + @RequestParam("limit") Integer limit, + @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus, + @RequestParam(value = "name", required = false) String name){ + + BabyManageRequest request = new BabyManageRequest(); + request.setMcardNo(mcardNo); + request.setServiceStatus(serviceStatus); + request.setName(request.getName()); + request.setLimit(limit); + request.setPage(page); + return babyBookbuildingFacade.queryBabyList(request); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java index 9a7929f..eead5e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java @@ -53,12 +53,26 @@ public class SmsTemplateController extends BaseController { /** * 根据条件查询短信模板列表 - * @param request * @return */ - @RequestMapping(method = RequestMethod.POST, value = "/querySmsTempList") + @RequestMapping(method = RequestMethod.GET, value = "/querySmsTempList") @ResponseBody - public BaseListResponse querySmsTemps(@RequestBody SmsTemplateRequest request) { + public BaseListResponse querySmsTemps(@RequestParam(value = "serviceObj", required = false) Integer serviceObj, + @RequestParam("page") Integer page, + @RequestParam("limit") Integer limit, + @RequestParam(value = "serviceType", required = false) Integer serviceType, + @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus, + @RequestParam(value = "smsType", required = false) Integer smsType, + @RequestParam(value = "content", required = false) String content) { + + SmsTemplateRequest request = new SmsTemplateRequest(); + request.setServiceObj(serviceObj); + request.setContent(content); + request.setServiceType(serviceType); + request.setSmsType(smsType); + request.setServiceStatus(serviceStatus); + request.setLimit(limit); + request.setPage(page); return smsTemplateFacade.querySmsTemps(request); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 5fca5c9..b37c742 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -639,10 +639,11 @@ public class BabyBookbuildingFacade { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setMcertNo(request.getMcardNo()); - babyQuery.setCardNo(request.getBcardNo()); + babyQuery.setServiceStatus(request.getServiceStatus()); babyQuery.setName(request.getName()); babyQuery.setNeed("1"); + babyQuery.setPage(request.getPage()); babyQuery.setLimit(request.getLimit()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java index 44ff4c9..274b3fb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java @@ -152,16 +152,18 @@ public class SmsTemplateFacade { SmsTemplateQuery query = new SmsTemplateQuery(); query.setYn(YnEnums.YES.getId()); query.setNeed("1"); + query.setLimit(request.getLimit()); + query.setPage(request.getPage()); if (request.getServiceObj() != null && request.getServiceObj() == 0) { //查询全部 request.setServiceObj(null); } -// if (request.getSmsType() != null && request.getSmsType() == 0) -// { -// -// } + if (request.getSmsType() != null && request.getSmsType() == 0) + { + request.setSmsType(null); + } if (request.getServiceType() != null && request.getServiceType() == 100) { request.setServiceType(null);