java/JiaDianHuiShou.git

			@@ -447,7 +447,7 @@
			orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());

			if (order.getState().equals(Constants.SIX) \|\| order.getState().equals(Constants.THREE)) {
			orderClient.updateState(order.getId(), Constants.ONE);
			orderClient.updateState(order.getId(), 7);

			//如果是待改派,将上门时间设置为最新的，并且更新再投原因
			if (order.getState().equals(Constants.SIX)){
			@@ -725,7 +725,10 @@
			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()+":"));
			}
			@@ -734,7 +737,10 @@

			@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");
			@@ -768,7 +774,11 @@
			}
			list.add(orderByServeRecord);
			}
			return R.ok(list);
			map.put("orderByServeRecordVO", list);
			MasterWorker masterWorker = masterWorkerService.getById(id);
			map.put("masterWorker", masterWorker);

			return R.ok(map);
			}

			/**