From 2d233c2394cb25a0e04abcf92357ad789f2e8c34 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 11 Jul 2024 14:43:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7=E6=8A=80?= =?UTF-8?q?=E5=B8=88=E5=8D=A0=E7=94=A8=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrdersServiceImpl.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 017a586..f6c538a 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -4636,7 +4636,7 @@ public class OrdersServiceImpl extends ServiceImpl implements Orders oldOrders = baseMapper.selectById(orders.getOrdersId()); int timeDifference = orders.getDuration()-oldOrders.getDuration(); if(timeDifference>0){ - ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper().eq("orders_id", orders.getOrdersId()).last(" order by artificer_time_id desc limit 1 ")); + ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper().eq("orders_id", orders.getOldOrdersId()).last(" order by artificer_time_id desc limit 1 ")); String serveTime = artificerTime.getArtificerDate() + " " + artificerTime.getArtificerTime(); Map map = getAddTaskTime(timeDifference,serveTime,value1,oldOrders.getArtificerId()); if(map.get("code").toString().equals("1")){ @@ -4646,14 +4646,18 @@ public class OrdersServiceImpl extends ServiceImpl implements insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId()); }else{ //技师占用时间表插入新订单号的同时间 - List artificerTimeList = artificerTimeService.list(new QueryWrapper().eq("orders_id", orders.getOrdersId()).last(" order by artificer_time_id")); + List artificerTimeList = artificerTimeService.list(new QueryWrapper().eq("orders_id", orders.getOldOrdersId()).last(" order by artificer_time_id")); if(artificerTimeList!=null && artificerTimeList.size()>0){ for(int i=0; i