diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 35bcfb9..e749ca2 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1077,11 +1077,37 @@ public class DateUtil { } /** - * 获取从现在到xx月之后的时间 - * @param currentMonthStart + * 获取当前时间加上xx月后的年月日时间 + * @param month * @return */ - public static Date getMonthDate(Integer currentMonthStart) { + public static Date getMonth(Integer month) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + calendar.add(Calendar.MONTH, month); + try { + return ymd.parse(ymd.format(calendar.getTime())); + } catch (ParseException e) { + e.printStackTrace(); + } return null; } + + /** + * 用于月龄查询 + * + * Date start = DateUtil.getBirthStart(endMonth); + * Date end = DateUtil.getBirthEnd(startMonth); + * criteria.and("birth").gte(start).lt(end); + * + * @param end + * @return + */ + public static Date getBirthStart(Integer end) { + return getMonth(-end); + } + public static Date getBirthEnd(Integer start) { + return addDay(getMonth(-start), 1); + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java index e95f207..603b91b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java @@ -93,8 +93,8 @@ public class BabyEyeCheckController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/export", method = RequestMethod.GET) - public void export(Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response) { - babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, currentMonth, chechMonth, positive, positiveIds, response); + public void export(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response) { + babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java index ddd3ec8..6fd0f2a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java @@ -27,5 +27,5 @@ public interface BabyEyeCheckService extends IBaseService { BaseResponse listInit(); - void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response); + void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 173fc8b..04b92a7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -274,9 +274,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye criteria.and("checkMonthId").is(chechMonth); } if(currentMonthStart != null && currentMonthEnd != null) { - Date start = DateUtil.getMonthDate(currentMonthStart); - Date end = DateUtil.getMonthDate(currentMonthEnd); - criteria.and("birth").gte(start).lt(DateUtil.addDay(end, 1)); + Date start = DateUtil.getBirthStart(currentMonthEnd); + Date end = DateUtil.getBirthEnd(currentMonthStart); + criteria.and("birth").gte(start).lt(end); } if(org.apache.commons.lang.StringUtils.isNotBlank(key)) { @@ -532,9 +532,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye } @Override - public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response) { -// BaseResponse rest = list(userId, startDate, endDate, doctor, key, currentMonth, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE); - BaseResponse rest = null; + public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response) { + BaseResponse rest = list(userId, startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE); PageResult pageResult = (PageResult) rest.getObject(); List> datas = (List>) pageResult.getGrid(); Map cnames = new LinkedHashMap<>();