Commit ce2b85908ba6046fbd9b9b9bcb9c52bdf98807cf
1 parent
2eaad9debc
Exists in
master
and in
6 other branches
辅助建档
Showing 1 changed file with 9 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
View file @
ce2b859
| ... | ... | @@ -142,7 +142,8 @@ |
| 142 | 142 | @ResponseBody |
| 143 | 143 | @TokenRequired |
| 144 | 144 | public BaseObjectResponse queryTodayArchiveList(HttpServletRequest request, |
| 145 | - @RequestParam(required = false) Integer assistUserId){ | |
| 145 | + @RequestParam(required = false) Integer assistUserId, | |
| 146 | + @RequestParam(required = false) String created){ | |
| 146 | 147 | Integer userId = getUserId(request); |
| 147 | 148 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 148 | 149 | ArchiveDataQuery query = new ArchiveDataQuery(); |
| ... | ... | @@ -152,8 +153,13 @@ |
| 152 | 153 | query.setAssistUserId(String.valueOf(assistUserId)); |
| 153 | 154 | } |
| 154 | 155 | |
| 155 | - query.setCreatedStart(DateUtil.formatDate(new Date())); | |
| 156 | - query.setCreatedEnd(DateUtil.addDay(DateUtil.formatDate(new Date()), 1)); | |
| 156 | + if (StringUtils.isNotEmpty(created)) | |
| 157 | + { | |
| 158 | + String[] arr = created.split(" - "); | |
| 159 | + query.setCreatedStart(DateUtil.parseYMD(arr[0])); | |
| 160 | + query.setCreatedEnd(DateUtil.addDay((DateUtil.parseYMD(arr[1])), 1)); | |
| 161 | + } | |
| 162 | + | |
| 157 | 163 | |
| 158 | 164 | List<Map> dataList = new ArrayList<>(); |
| 159 | 165 |