Commit 2c8000b8548849a8313e4401643e03b08b9b1e53
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
View file @
2c8000b
| ... | ... | @@ -944,8 +944,8 @@ |
| 944 | 944 | String planTimeEnd = ""; |
| 945 | 945 | if (StringUtils.isNotEmpty(planTime)) |
| 946 | 946 | { |
| 947 | - planTimeStart =DateUtil.parseYMD(planTime.split(" - ")[0]) +" 00:00:00"; | |
| 948 | - planTimeEnd = DateUtil.parseYMD(planTime.split(" - ")[1])+" 23:59:59"; | |
| 947 | + planTimeStart = planTime.split(" - ")[0] +" 00:00:00"; | |
| 948 | + planTimeEnd = planTime.split(" - ")[1]+" 23:59:59"; | |
| 949 | 949 | } |
| 950 | 950 | |
| 951 | 951 | String actualTimeStart = ""; |
| ... | ... | @@ -953,8 +953,8 @@ |
| 953 | 953 | if (StringUtils.isNotEmpty(actualTime)) |
| 954 | 954 | { |
| 955 | 955 | |
| 956 | - actualTimeStart = DateUtil.parseYMD(actualTime.split(" - ")[0])+" 00:00:00"; | |
| 957 | - actualTimeEnd = DateUtil.parseYMD(actualTime.split(" - ")[1]) + " 23:59:59"; | |
| 956 | + actualTimeStart = actualTime.split(" - ")[0]+" 00:00:00"; | |
| 957 | + actualTimeEnd = actualTime.split(" - ")[1] + " 23:59:59"; | |
| 958 | 958 | } |
| 959 | 959 | List<Map<String,String>> list = new ArrayList<>(); |
| 960 | 960 |