服务升级技师占用时间调整
This commit is contained in:
parent
61252908cd
commit
2d233c2394
|
@ -4636,7 +4636,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
Orders oldOrders = baseMapper.selectById(orders.getOrdersId());
|
Orders oldOrders = baseMapper.selectById(orders.getOrdersId());
|
||||||
int timeDifference = orders.getDuration()-oldOrders.getDuration();
|
int timeDifference = orders.getDuration()-oldOrders.getDuration();
|
||||||
if(timeDifference>0){
|
if(timeDifference>0){
|
||||||
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()).last(" order by artificer_time_id desc limit 1 "));
|
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOldOrdersId()).last(" order by artificer_time_id desc limit 1 "));
|
||||||
String serveTime = artificerTime.getArtificerDate() + " " + artificerTime.getArtificerTime();
|
String serveTime = artificerTime.getArtificerDate() + " " + artificerTime.getArtificerTime();
|
||||||
Map<String,Object> map = getAddTaskTime(timeDifference,serveTime,value1,oldOrders.getArtificerId());
|
Map<String,Object> map = getAddTaskTime(timeDifference,serveTime,value1,oldOrders.getArtificerId());
|
||||||
if(map.get("code").toString().equals("1")){
|
if(map.get("code").toString().equals("1")){
|
||||||
|
@ -4646,14 +4646,18 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
|
insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
|
||||||
}else{
|
}else{
|
||||||
//技师占用时间表插入新订单号的同时间
|
//技师占用时间表插入新订单号的同时间
|
||||||
List<ArtificerTime> artificerTimeList = artificerTimeService.list(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()).last(" order by artificer_time_id"));
|
List<ArtificerTime> artificerTimeList = artificerTimeService.list(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOldOrdersId()).last(" order by artificer_time_id"));
|
||||||
if(artificerTimeList!=null && artificerTimeList.size()>0){
|
if(artificerTimeList!=null && artificerTimeList.size()>0){
|
||||||
for(int i=0; i<artificerTimeList.size(); i++){
|
for(int i=0; i<artificerTimeList.size(); i++){
|
||||||
ArtificerTime artificerTime = artificerTimeList.get(i);
|
ArtificerTime artificerTime = artificerTimeList.get(i);
|
||||||
artificerTime.setArtificerId(orders.getArtificerId());
|
ArtificerTime artificerTime2 = new ArtificerTime();
|
||||||
artificerTime.setOrdersId(orders.getOrdersId());
|
artificerTime2.setArtificerId(orders.getArtificerId());
|
||||||
artificerTime.setCreateTime(DateUtils.format(new Date()));
|
artificerTime2.setArtificerDate(artificerTime.getArtificerDate());
|
||||||
artificerTimeService.save(artificerTime);
|
artificerTime2.setArtificerTime(artificerTime.getArtificerTime());
|
||||||
|
artificerTime2.setClassify(1);
|
||||||
|
artificerTime2.setOrdersId(orders.getOrdersId());
|
||||||
|
artificerTime2.setCreateTime(DateUtils.format(new Date()));
|
||||||
|
artificerTimeService.save(artificerTime2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue