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 29c165e..40a196e 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 @@ -742,8 +742,8 @@ public class DateUtil { // System.out.println(s); // Date s = addDay(parseYMD("2016-02-26"), 168); - Date startDate = DateUtil.getNewDate(-0,"月",0); - Date endDate = DateUtil.getNewDate(-1,"月",0); + Date startDate = DateUtil.getNewDate(-0,"周",0); + Date endDate = DateUtil.getNewDate(-1-1,"周",0); System.out.println(startDate + "==="+ endDate); } catch (Exception e) diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index e04803b..e0c0054 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -1117,7 +1117,7 @@ public class SmsServiceImpl implements SmsService{ if (start != null && end != null) { Date startDate = DateUtil.getNewDate(-end, "月", sendTimeType); - Date endDate = DateUtil.getNewDate(-start,"月",sendTimeType); + Date endDate = DateUtil.getNewDate(-start-1,"月",sendTimeType); babyModelQuery.setBirthStart(startDate); babyModelQuery.setBirthEnd(endDate); 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 9cadfab..ce88b92 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 @@ -1788,6 +1788,7 @@ public class BabyBookbuildingFacade { cnames.put("monthAge","月龄"); cnames.put("diagnose","高危诊断"); httpServletResponse.setContentType("application/octet-stream"); + httpServletResponse.setCharacterEncoding("UTF-8"); httpServletResponse.setHeader("Content-Disposition", "attachment;fileName="+"childDatas.xls"); ExcelUtil.toExcel(out,datas,cnames); } catch (IOException e) {