Commit 7d0d8ed4dd2a3adc7928c502b272aaab6f82801a
1 parent
c6f9a49c59
Exists in
master
and in
6 other branches
update code
Showing 3 changed files with 8 additions and 18 deletions
platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java
View file @
7d0d8ed
| ... | ... | @@ -240,15 +240,5 @@ |
| 240 | 240 | } |
| 241 | 241 | return Math.abs(result); |
| 242 | 242 | } |
| 243 | - | |
| 244 | -// public static void main(String[] args) | |
| 245 | -// { | |
| 246 | -// Date startDate = DateUtils.getNewDate(new Date(),-9-1, "月", 1); | |
| 247 | -// Date endDate = DateUtils.getNewDate(new Date(),-9,"月",1); | |
| 248 | -// System.out.println(getDateStr(startDate,Y_M_D)); | |
| 249 | -// System.out.println(getDateStr(endDate,Y_M_D)); | |
| 250 | -// } | |
| 251 | - | |
| 252 | - | |
| 253 | 243 | } |
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
View file @
7d0d8ed
| ... | ... | @@ -639,10 +639,10 @@ |
| 639 | 639 | Integer end = template.getEnd(); |
| 640 | 640 | |
| 641 | 641 | if (start != null && end != null) { |
| 642 | - Date startDate = DateUtil.getNewDate(-end, "天", sendTimeType); | |
| 643 | - Date endDate = DateUtil.getNewDate(-start, "天", sendTimeType); | |
| 644 | - startDate = DateUtil.formatDate(startDate); | |
| 645 | - endDate = DateUtil.formatDate(endDate); | |
| 642 | + Date startDate = DateUtils.getNewDate(new Date(),-end, "天", sendTimeType); | |
| 643 | + Date endDate = DateUtils.getNewDate(new Date(),-start, "天", sendTimeType); | |
| 644 | + startDate = DateUtils.formatDate(startDate,DateUtils.Y_M_D); | |
| 645 | + endDate = DateUtils.formatDate(endDate,DateUtils.Y_M_D); | |
| 646 | 646 | patientsQuery.setFmDateStart(startDate); |
| 647 | 647 | patientsQuery.setFmDateEnd(endDate); |
| 648 | 648 | List<Patients> patientses = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); |
| 649 | 649 | |
| ... | ... | @@ -699,11 +699,11 @@ |
| 699 | 699 | private boolean queryPostOrder(Date dueDate,Integer start,String tempHid,Integer sendTimeType,String pid) |
| 700 | 700 | { |
| 701 | 701 | Set<String> idset = new HashSet<>(); |
| 702 | - Date startDate = DateUtil.getRangeDate(dueDate, start, "周", -sendTimeType); | |
| 702 | + Date startDate = DateUtils.getNewDate(dueDate, start, "周", -sendTimeType); | |
| 703 | 703 | if (startDate != null) |
| 704 | 704 | { |
| 705 | 705 | //把时间格式化成 yyyy_MM_dd 的日期 |
| 706 | - startDate = DateUtil.formatDate(startDate); | |
| 706 | + startDate = DateUtils.formatDate(startDate,DateUtils.Y_M_D); | |
| 707 | 707 | } |
| 708 | 708 | List<PostReviewModel> models = postReviewService.queryPostOrder(startDate, tempHid, pid); |
| 709 | 709 | if (CollectionUtils.isNotEmpty(models)) |
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java
View file @
7d0d8ed
| ... | ... | @@ -114,8 +114,8 @@ |
| 114 | 114 | patientsQuery.setDueStatus(0); |
| 115 | 115 | |
| 116 | 116 | //末次月经必须大于当前时间减去42周视为未分娩孕妇 |
| 117 | - Date lastMenses = DateUtil.getNewDate(-42, "周", 0); | |
| 118 | - Date lastMensesMax = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(lastMenses)); | |
| 117 | + Date lastMenses = DateUtils.getNewDate(new Date(),-42, "周", 0); | |
| 118 | + Date lastMensesMax = DateUtils.formatDate(lastMenses,DateUtils.Y_M_D); | |
| 119 | 119 | patientsQuery.setLastMensesStart(lastMensesMax); |
| 120 | 120 | //健康指导短信 只能是类型为 增值服务 开通状态 才发送 |
| 121 | 121 | patientsQuery.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); |