From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index 2ff3bd2..747f7ab 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -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);
}
/**
--
Gitblit v1.7.1