|
@@ -182,7 +182,7 @@ public class BmsEventOrderService {
|
|
|
resVO.setOrderTypeName(OrderTypeEnum.getCodeToName(item.getOrderType()));
|
|
|
resVO.setStatusName(OrderStatusEnum.getCodeToName(item.getStatus()));
|
|
|
QueryWrapper<CareEventOrderHandleHis> queryWrapper2 = new QueryWrapper<>();
|
|
|
- queryWrapper2.lambda().eq(CareEventOrderHandleHis::getOrderId,item.getId());
|
|
|
+ queryWrapper2.lambda().eq(CareEventOrderHandleHis::getOrderId,item.getId()).eq(CareEventOrderHandleHis::getLogType,LogTypeEnum.DEV_EVENT);
|
|
|
resVO.setWarnCount(careEventOrderHandleHisService.count(queryWrapper2));
|
|
|
list.add(resVO);
|
|
|
});
|
|
@@ -200,7 +200,7 @@ public class BmsEventOrderService {
|
|
|
public List<OrderHandleHisVO> listHisWarn(Long orderId) {
|
|
|
CareEventOrder order = this.careEventOrderService.getById(orderId);
|
|
|
QueryWrapper<CareEventOrderHandleHis> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.lambda().eq(CareEventOrderHandleHis::getOrderId,order.getId()).orderByDesc(CareEventOrderHandleHis::getCreateTime);
|
|
|
+ queryWrapper.lambda().eq(CareEventOrderHandleHis::getOrderId,order.getId()).eq(CareEventOrderHandleHis::getLogType,LogTypeEnum.DEV_EVENT).orderByDesc(CareEventOrderHandleHis::getCreateTime);
|
|
|
List<CareEventOrderHandleHis> list = careEventOrderHandleHisService.list(queryWrapper);
|
|
|
List<OrderHandleHisVO> listHisWarn = new ArrayList<>();
|
|
|
if(CollUtil.isNotEmpty(list)){
|