Commit 3810b54d39b3f57ad5d87726450efcd0ce0beddb
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 3 changed files
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
View file @
3810b54
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
View file @
3810b54
| ... | ... | @@ -620,7 +620,7 @@ |
| 620 | 620 | SmsConfigQuery configQuery = new SmsConfigQuery(); |
| 621 | 621 | configQuery.setYn(YnEnums.YES.getId()); |
| 622 | 622 | configQuery.setPrefixTypes(new Integer[]{0, 1}); |
| 623 | - configQuery.setHospitalId(221 + ""); | |
| 623 | +// configQuery.setHospitalId(221 + ""); | |
| 624 | 624 | |
| 625 | 625 | //查询出对应医院配置 |
| 626 | 626 | List<SmsConfigModel> configs = smsConfigService.querySmsConfig(configQuery); |
| ... | ... | @@ -661,10 +661,10 @@ |
| 661 | 661 | for (SmsTemplateModel template : templates) |
| 662 | 662 | { |
| 663 | 663 | |
| 664 | - if (!("57d65fa80cf2798825ca2d87".equals(template.getId())) ) | |
| 665 | - { | |
| 666 | - continue; | |
| 667 | - } | |
| 664 | +// if (!("57d65fa80cf2798825ca2d87".equals(template.getId())) ) | |
| 665 | +// { | |
| 666 | +// continue; | |
| 667 | +// } | |
| 668 | 668 | |
| 669 | 669 | |
| 670 | 670 | //模板属于的医院id |
| ... | ... | @@ -2198,7 +2198,7 @@ |
| 2198 | 2198 | request.setObjType(serviceObj); |
| 2199 | 2199 | request.setPhone(phone); |
| 2200 | 2200 | //计划发送时间 |
| 2201 | - request.setPlanTime(DateUtil.getyyyy_MM_dd(new Date())+ SEND_TIME +":00"); | |
| 2201 | + request.setPlanTime(DateUtil.getyyyy_MM_dd(new Date())+ " " + SEND_TIME +":00"); | |
| 2202 | 2202 | //短信商 |
| 2203 | 2203 | request.setServiceType(SmsProviderEnums.YM.getId()); |
| 2204 | 2204 | request.setSubTypeId(smsType); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
View file @
3810b54