| | |
|---|
| | | if (workIds==null||workIds.isEmpty()){ |
|---|
| | | return R.ok(new ArrayList<>()); |
|---|
| | | } |
|---|
| | | List<MasterWorker> list = masterWorkerService.lambdaQuery().in(MasterWorker::getId, workIds).eq(name!=null&&name!="",MasterWorker::getRealName,name).eq(cityCode!=null&&cityCode!="", MasterWorker::getCityCode,cityCode).list(); |
|---|
| | | List<MasterWorker> list = masterWorkerService.lambdaQuery() |
|---|
| | | .in(MasterWorker::getId, workIds) |
|---|
| | | .eq(name!=null&&name!="",MasterWorker::getRealName,name) |
|---|
| | | .eq(cityCode!=null&&cityCode!=""&&!cityCode.contains("0000"), MasterWorker::getCityCode,cityCode).list(); |
|---|
| | | for (MasterWorker masterWorker : list) { |
|---|
| | | masterWorker.setLacation(redisService.getCacheObject("work:"+masterWorker.getId()+":")); |
|---|
| | | } |
|---|
| | |
|---|
| | | |
|---|
| | | @ApiOperation(value = "获师傅", tags = {"后台-订单管理-地图统计"}) |
|---|
| | | @PostMapping(value = "/map/line") |
|---|
| | | public R<List<OrderByServeRecordVO>> line(Integer id) { |
|---|
| | | public R<Map<String,Object>> line(Integer id) { |
|---|
| | | |
|---|
| | | Map<String,Object> map = new HashMap<>(); |
|---|
| | | |
|---|
| | | List<OrderByServeRecordVO> list = new ArrayList<>(); |
|---|
| | | // 获取当天时间 |
|---|
| | | String today = DateUtils.dateTimeNow("yyyy-MM-dd"); |
|---|
| | |
|---|
| | | } |
|---|
| | | list.add(orderByServeRecord); |
|---|
| | | } |
|---|
| | | return R.ok(list); |
|---|
| | | map.put("orderByServeRecordVO", list); |
|---|
| | | MasterWorker masterWorker = masterWorkerService.getById(id); |
|---|
| | | map.put("masterWorker", masterWorker); |
|---|
| | | |
|---|
| | | return R.ok(map); |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** |
|---|
