Kaynağa Gözat

二期后台 bug

suntianwu 3 yıl önce
ebeveyn
işleme
fe2ef69908

+ 2 - 2
src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -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)){

+ 4 - 3
src/main/java/com/care/common/enums/LogTypeEnum.java

@@ -10,9 +10,10 @@ public enum LogTypeEnum {
      *日志类型:
      * 1: 发生事件
      * 2:呼叫日志
-     * 3 钥匙日志
-     * 4 管家日志
-     * 5 短信
+     * 3: 呼叫日志
+     * 4 钥匙日志
+     * 5 管家日志
+     * 6 短信
      */
     DEV_EVENT(1,"设备监控"),
     OLDER_EVENT(2,"老人呼叫"),