Commit 480fe45a by 吕明尚

修改生成保洁判断条件

parent 77dc8f55
...@@ -407,7 +407,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -407,7 +407,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
if (request.getIsClean().equals(YesNoEnum.yes.getIndex())) { if (request.getIsClean().equals(YesNoEnum.yes.getIndex())) {
//判断订单是否已经添加保洁记录 //判断订单是否已经添加保洁记录
SCleanRecords cleanRecords = isCleanRecordsService.lastCleanByRoomId(sOrder.getRoomId()); SCleanRecords cleanRecords = isCleanRecordsService.lastCleanByRoomId(sOrder.getRoomId());
if (ObjectUtil.isEmpty(getOne(new LambdaQueryWrapper<SOrder>() if (CollectionUtils.isEmpty(list(new LambdaQueryWrapper<SOrder>()
.eq(SOrder::getRoomId, sOrder.getRoomId()) .eq(SOrder::getRoomId, sOrder.getRoomId())
.eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode()) .eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode())
.ne(SOrder::getOrderNo, request.getOrderNo()))) .ne(SOrder::getOrderNo, request.getOrderNo())))
...@@ -606,7 +606,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -606,7 +606,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
if (dto.getIsClean().equals(YesNoEnum.yes.getIndex())) { if (dto.getIsClean().equals(YesNoEnum.yes.getIndex())) {
//判断订单是否已经添加保洁记录 //判断订单是否已经添加保洁记录
SCleanRecords cleanRecords = isCleanRecordsService.lastCleanByRoomId(oldSOrder.getRoomId()); SCleanRecords cleanRecords = isCleanRecordsService.lastCleanByRoomId(oldSOrder.getRoomId());
if (ObjectUtil.isEmpty(getOne(new LambdaQueryWrapper<SOrder>() if (CollectionUtils.isEmpty(list(new LambdaQueryWrapper<SOrder>()
.eq(SOrder::getRoomId, oldSOrder.getRoomId()) .eq(SOrder::getRoomId, oldSOrder.getRoomId())
.eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode()) .eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode())
.ne(SOrder::getOrderNo, oldSOrder.getOrderNo()))) && .ne(SOrder::getOrderNo, oldSOrder.getOrderNo()))) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment