diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java index 661d58f..89a3fce 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java @@ -2,6 +2,8 @@ package com.lyms.talkonlineweb.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.lyms.talkonlineweb.domain.*; @@ -10,6 +12,7 @@ import com.lyms.talkonlineweb.service.*; import com.lyms.talkonlineweb.util.Constant; import com.lyms.talkonlineweb.util.HXService; import com.lyms.talkonlineweb.util.JwtUtils; +import com.lyms.talkonlineweb.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; import org.springframework.validation.annotation.Validated; @@ -234,8 +237,15 @@ public class DoctorController { @GetMapping("appGetDoctorList") public BaseResponse appGetDoctorList(AppgetdoctorlistInfo appgetdoctorlistInfo, int current, int size){ BaseResponse baseResponse=new BaseResponse(); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda(); + queryWrapper.setEntity(appgetdoctorlistInfo); + if(StringUtil.isNotEmpty(appgetdoctorlistInfo.getSearchinfo())){ + queryWrapper.eq(AppgetdoctorlistInfo::getDname, appgetdoctorlistInfo.getSearchinfo()) + .or().eq(AppgetdoctorlistInfo::getDpname,appgetdoctorlistInfo.getSearchinfo()) + .or().eq(AppgetdoctorlistInfo::getLvlname, appgetdoctorlistInfo.getSearchinfo()); + } Page page=new Page<>(current,size); - Page appgetdoctorlistInfoPage=appgetdoctorlistInfoService.page(page,Wrappers.query(appgetdoctorlistInfo)); + Page appgetdoctorlistInfoPage=appgetdoctorlistInfoService.page(page,queryWrapper); baseResponse.setObject(appgetdoctorlistInfoPage); return baseResponse; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/AppgetdoctorlistInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/AppgetdoctorlistInfo.java index ff9e2c4..a9250f8 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/AppgetdoctorlistInfo.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/AppgetdoctorlistInfo.java @@ -27,6 +27,12 @@ public class AppgetdoctorlistInfo implements Serializable { private Integer hid; /** + * 医生头像 + */ + @TableField(value = "headimg") + private String headimg; + + /** * 医生名称 */ @TableField(value = "dname") @@ -55,6 +61,11 @@ public class AppgetdoctorlistInfo implements Serializable { */ @TableField(value = "intro") private String intro; + /** + * 搜索内容 + */ + @TableField(exist = false) + private String searchinfo; @TableField(exist = false) private static final long serialVersionUID = 1L;