jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit c6eb32081e53dc18fbde4e10e05f10f6e6d41902

Authored by litao@lymsh.com
1 parent 389bac8059
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

bbbbbb

Showing 4 changed files with 5 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java View file @ c6eb320
... ... @@ -39,8 +39,8 @@
39 39 @ResponseBody
40 40 @TokenRequired
41 41 @RequestMapping(method = RequestMethod.GET)
42   - public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, @RequestParam Integer trackType, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request) {
43   - return trackDownService.list(provinceId, cityId, areaId, streetId, trackType, page, limit, getUserId(request));
  42 + public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, String key, @RequestParam Integer trackType, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request) {
  43 + return trackDownService.list(provinceId, cityId, areaId, streetId, key, trackType, page, limit, getUserId(request));
44 44 }
45 45  
46 46 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java View file @ c6eb320
... ... @@ -9,7 +9,7 @@
9 9  
10 10 BaseResponse add(Integer userId, TrackDown trackDown);
11 11  
12   - BaseResponse list(String provinceId, String cityId, String areaId, String streetId, Integer trackType, Integer page, Integer limit, Integer userId);
  12 + BaseResponse list(String provinceId, String cityId, String areaId, String streetId, String key, Integer trackType, Integer page, Integer limit, Integer userId);
13 13  
14 14 BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId);
15 15  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ c6eb320
... ... @@ -327,7 +327,7 @@
327 327 if(flag) {
328 328 for (Map<String, Date> dateMap : range) {
329 329 if(patient.getBookbuildingDate().getTime() >= dateMap.get("start").getTime()
330   - && patient.getBookbuildingDate().getTime() < dateMap.get("end").getTime()) {
  330 + && patient.getBookbuildingDate().getTime() <= dateMap.get("end").getTime()) {
331 331 String monthKey = DateUtil.getyyyy_mm(dateMap.get("cname"));
332 332 Map<String, Object> info = new HashMap<>();
333 333 Set<String> hids = new HashSet<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ c6eb320
... ... @@ -187,7 +187,7 @@
187 187 }
188 188  
189 189 @Override
190   - public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, Integer trackType, Integer page, Integer limit, Integer userId) {
  190 + public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, String key, Integer trackType, Integer page, Integer limit, Integer userId) {
191 191 PageResult pageResult = new PageResult();
192 192 List<Map<String, Object>> restList = new ArrayList<>();
193 193 Criteria criteria = new Criteria();