大屏服务详情列表

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/PhoneListDTO.java

@@ -19,6 +19,8 @@ public class PhoneListDTO {
      */
     @Schema(description = "0:呼入 1:受理 2:突发重大伤病应急 3:重大伤病应急")
     private String phoneType;
+    @Schema(description = "姓名")
+    private String realName;
     /**
      * 0:全部 1:女 2:男
      */

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java

@@ -1,5 +1,6 @@
 package com.renkang.emergency.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjUtil;
@@ -331,6 +332,13 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
         if (StrUtil.isNotBlank(dto.getSex()) && !"0".equals(dto.getSex())) {
             queryWrapper.eq(TblUserHelp::getSex, dto.getSex());
         }
+        if (StrUtil.isNotEmpty(dto.getRealName())) {
+            List<String> userIds = sysBaseAPI.getUserIdsByDepartAndUsername(null, dto.getRealName(), null, null);
+            if (CollUtil.isEmpty(userIds)) {
+                return new Page<>();
+            }
+            queryWrapper.in(TblUserHelp::getUserId, userIds);
+        }
         if (ObjUtil.isNotEmpty(dto.getStartDate()) && ObjUtil.isNotEmpty(dto.getEndDate())) {
             queryWrapper.between(TblUserHelp::getHelpTime,
                     DateUtil.beginOfDay(dto.getStartDate()),
@@ -338,6 +346,9 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
         }
         queryWrapper.orderByDesc(TblUserHelp::getHelpTime);
         Page<TblUserHelp> returnPage = this.page(new Page<>(dto.getPageNo(), dto.getPageSize()), queryWrapper);
+        if (returnPage.getRecords()==null || returnPage.getRecords().isEmpty()) {
+            return new Page<>();
+        }
         Page<TblQimoNoticeVo> pageVo = new Page<>();
         BeanUtils.copyProperties(returnPage, pageVo);
         List<TblUserHelp> records = returnPage.getRecords();