Commit 5ff3888cf758f7126c43978ce68e09307291e3ac
1 parent
299e571194
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 6 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
View file @
5ff3888
| ... | ... | @@ -199,10 +199,12 @@ |
| 199 | 199 | } |
| 200 | 200 | String createTime = param.getCreateTime(); |
| 201 | 201 | if (StringUtils.isNotEmpty(createTime)) { |
| 202 | - Date date = DateUtil.parseYMD(createTime); | |
| 203 | - Date dayFirstSecond = DateUtil.getDayFirstSecond(date); | |
| 204 | - Date dayLastSecond = DateUtil.getDayLastSecond(date); | |
| 205 | - query.addCriteria(Criteria.where("fillDate").gte(dayFirstSecond).lte(dayLastSecond)); | |
| 202 | + String[] arrs = createTime.split(" - "); | |
| 203 | + | |
| 204 | + Date start = DateUtil.parseYMD(arrs[0]); | |
| 205 | + Date end = DateUtil.parseYMD(arrs[1]); | |
| 206 | + end = DateUtil.getDayLastSecond(end); | |
| 207 | + query.addCriteria(Criteria.where("fillDate").gte(start).lte(end)); | |
| 206 | 208 | } |
| 207 | 209 | |
| 208 | 210 | query = getQueryByAddress(param, searchType, query); |