diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index 9d74655..6cb119a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -95,7 +95,7 @@ public class BabyCheckController extends BaseController{ @TokenRequired public BaseObjectResponse queryChooseBabys(HttpServletRequest request,@RequestParam(required = false)String vcCardNo,@RequestParam(required = false)String cardNo){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo,loginState.getId()); + return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId()); } @@ -151,6 +151,18 @@ public class BabyCheckController extends BaseController{ } + /** + * 计算儿童月龄 + */ + @RequestMapping(value = "/getBabyMonthAge", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse getBabyMonthAge( + @RequestParam(required = true) String birth, + @RequestParam(required = false) String checkDate){ + return babyCheckFacade.getBabyMonthAge(birth,checkDate); + + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 2f0d7c2..dd4db49 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -538,8 +538,8 @@ public class BabyCheckFacade { results.add(result); } } - map.put("isBuild",isBuild); - map.put("boies",results); + map.put("isBuild", isBuild); + map.put("boies", results); br.setData(map); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); @@ -874,4 +874,20 @@ public class BabyCheckFacade { return objectResponse; } + + public BaseObjectResponse getBabyMonthAge(String birth, String checkDate) { + Date birthDate = DateUtil.parseYMD(birth); + Date date = new Date(); + if (StringUtils.isNotEmpty(checkDate)) + { + date = DateUtil.parseYMD(checkDate); + } + String ageStr = DateUtil.getBabyMonthAge(birthDate,date); + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(ageStr); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + + return objectResponse; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 13153f2..b31ce04 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -298,20 +298,86 @@ public class BookbuildingFacade { } } -// if (templateModel == null) -// { -// for (SmsTemplateModel temp : temps) -// { -// if (temp.getServiceType() == serviceType) -// { -// templateModel = temp; -// break; -// } -// } -// } + if (templateModel == null) + { + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceStatus() == serviceStatus) + { + templateModel = temp; + break; + } + } + } + + if (templateModel == null) + { + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceType() == serviceType) + { + templateModel = temp; + break; + } + } + } + + if (templateModel == null) + { + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) + { + if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() ) + { + templateModel = temp; + break; + } + } + } + } + if (templateModel == null) + { + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) + { + if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() ) + { + templateModel = temp; + break; + } + } + } + } + if (templateModel == null) + { + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) + { + if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() ) + { + templateModel = temp; + break; + } + } + } + } + if (templateModel == null) + { + for (SmsTemplateModel temp : temps) + { + if (temp.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) + { + templateModel = temp; + break; + } + } + } if (templateModel != null && templateModel.getStatus() == 1) {