| | |
| | | // param.remove("row"); |
| | | // } |
| | | // } |
| | | Object query_date = param.get("query_date"); |
| | | param.remove("query_date"); |
| | | excludeTrash(param); |
| | | convert(param, wrapper); |
| | | allLike(LocDetl.class, param.keySet(), wrapper, condition); |
| | |
| | | // wrapper.and() |
| | | // .where("loc_no like '" +row +"%'"); |
| | | // } |
| | | if (query_date!=null){ |
| | | if (query_date.toString().contains(" - ")) { |
| | | String[] dates = query_date.toString().split(" - "); |
| | | wrapper.ge("appe_time", dates[0]).le("appe_time",dates[1]); |
| | | } |
| | | } |
| | | return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper)); |
| | | } |
| | | |
| | |
| | | public R statis(@RequestParam(defaultValue = "1")Integer curr, |
| | | @RequestParam(defaultValue = "10")Integer limit, |
| | | @RequestParam Map<String, Object> param) { |
| | | System.out.println(JSONObject.toJSON(param)); |
| | | Page<StockStatisDTO> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, StockStatisDTO.class)); |
| | | return R.ok().add(stockStatis); |
| | | } |