fixed: 1

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -92,12 +92,16 @@ public class BmsEventOrderService {
         IPage<CareEventOrder> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
         QueryWrapper<CareEventOrder> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(StrUtil.isNotEmpty(orderStatus), CareEventOrder::getStatus, orderStatus)
-                .like(StrUtil.isNotEmpty(title), CareEventOrder::getTitle, title)
+//                .like(StrUtil.isNotEmpty(title), CareEventOrder::getTitle, title)
                 .like(StrUtil.isNotEmpty(olderName), CareEventOrder::getOlderName, olderName)
                 .eq(CareEventOrder::getOrgId, loginUser.getOrgId())
                 .eq(loginUser.getStationId() != null, CareEventOrder::getStationId, loginUser.getStationId())
                 .orderByDesc(CareEventOrder::getCreateTime);
 
+        if (StrUtil.isNotEmpty(title)) {
+            queryWrapper.lambda().and(wrapper -> wrapper.like(CareEventOrder::getTitle, title).or().eq(CareEventOrder::getDevCode, title));
+        }
+
         IPage<CareEventOrder> pageRes = this.careEventOrderService.page(page, queryWrapper);
         IPage<EventOrderVO> results = new Page<>(pageRes.getCurrent(), pageRes.getSize(), pageRes.getTotal());
         if (CollUtil.isNotEmpty(pageRes.getRecords())) {

src/main/java/com/care/common/vo/order/EventStaVO.java

@@ -20,4 +20,6 @@ public class EventStaVO {
     private Integer doingCount;
     @ApiModelProperty(value = "完成事件")
     private Integer doneCount;
+    @ApiModelProperty(value = "取消事件")
+    private Integer cancelCount;
 }

src/main/resources/mybatis/CareEventOrderMapper.xml

@@ -7,7 +7,8 @@
             count(1) as allCount,
             count(if(status='0',1,null)) as notDoCount,
             count(if(status='1',1,null)) as doingCount,
-            count(if(status='2',1,null))+count(if(status='3',1,null))+count(if(status='4',1,null)) as doneCount
+            count(if(status='2',1,null))+count(if(status='3',1,null))+count(if(status='4',1,null)) as doneCount,
+            count(if(status='3',1,null)) as cancelCount
         from care_event_order
         <where>
             <if test="orgId != null ">