From ce2b85908ba6046fbd9b9b9bcb9c52bdf98807cf Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 16 Aug 2018 11:42:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=85=E5=8A=A9=E5=BB=BA=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/RemoteController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index fbbfab7..aff0625 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -142,7 +142,8 @@ public class RemoteController extends BaseController { @ResponseBody @TokenRequired public BaseObjectResponse queryTodayArchiveList(HttpServletRequest request, - @RequestParam(required = false) Integer assistUserId){ + @RequestParam(required = false) Integer assistUserId, + @RequestParam(required = false) String created){ Integer userId = getUserId(request); String hospitalId = autoMatchFacade.getHospitalId(userId); ArchiveDataQuery query = new ArchiveDataQuery(); @@ -152,8 +153,13 @@ public class RemoteController extends BaseController { query.setAssistUserId(String.valueOf(assistUserId)); } - query.setCreatedStart(DateUtil.formatDate(new Date())); - query.setCreatedEnd(DateUtil.addDay(DateUtil.formatDate(new Date()), 1)); + if (StringUtils.isNotEmpty(created)) + { + String[] arr = created.split(" - "); + query.setCreatedStart(DateUtil.parseYMD(arr[0])); + query.setCreatedEnd(DateUtil.addDay((DateUtil.parseYMD(arr[1])), 1)); + } + List dataList = new ArrayList<>(); -- 1.8.3.1