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 c134894..5f95fe4 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,18 +742,23 @@ public class DateUtil { // System.out.println(s); // Date s = addDay(parseYMD("2016-02-26"), 168); - int start = 3; - int end = 3; + int start = 1; + int end = 1; // // // Date startDate = DateUtil.getNewDate(-end-1,"周",1+1); // Date endDate = DateUtil.getNewDate(-start,"周",0+1); - Date startDate = DateUtil.getNewDate(-end-1,"月",1); - Date endDate = DateUtil.getNewDate(-start,"月",1); + Date startDate = DateUtil.getNewDate(-end-1,"周",2+1); + Date endDate = DateUtil.getNewDate(-start,"周",2); - System.out.println(startDate + "==="+ endDate); + + String date = y_m_d_h_m_s.format(startDate.getTime()); +// Date startDate = DateUtil.getNewDate(-end-1,"月",1); +// Date endDate = DateUtil.getNewDate(-start,"月",1); + + System.out.println(date + "==="); // Date startDate = getRangeDate(parseYMD("2016-09-07"),2,"周",-1); 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 baebe5e..08206e3 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 @@ -788,6 +788,8 @@ public class SmsServiceImpl implements SmsService{ { Date startDate = DateUtil.getNewDate(-end-1,"周",sendTimeType+1); Date endDate = DateUtil.getNewDate(-start,"周",sendTimeType); + startDate = DateUtil.formatDate(startDate); + endDate = DateUtil.formatDate(endDate); patientsQuery.setLastMensesStart(startDate); patientsQuery.setLastMensesEnd(endDate); //查询符合条件的孕妇 @@ -1012,8 +1014,10 @@ public class SmsServiceImpl implements SmsService{ if (end != null && start != null) { - Date startDate = DateUtil.getNewDate(-end-1,"周",sendTimeType); + Date startDate = DateUtil.getNewDate(-end-1,"周",sendTimeType+1); Date endDate = DateUtil.getNewDate(-start,"周",sendTimeType); + startDate = DateUtil.formatDate(startDate); + endDate = DateUtil.formatDate(endDate); patientsQuery.setLastMensesStart(startDate); patientsQuery.setLastMensesEnd(endDate);