1、oa申请分页接口模糊查询信息：入职、转正、续签

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/conversion/vo/OaConversionPageReqVO.java

@@ -1,12 +1,13 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo;
 
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -49,5 +50,7 @@ public class OaConversionPageReqVO extends PageParam {
     @Schema(description = "用户id")
     private Long userId;
 
+    @Schema(description = "模糊查询字符串，主要用于移动端")
+    private String str;
 
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/entry/vo/OaEntryPageReqVO.java

@@ -1,10 +1,13 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.entry.vo;
 
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
-import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -50,5 +53,7 @@ public class OaEntryPageReqVO extends PageParam {
     @Schema(description = "用户id")
     private Long userId;
 
+    @Schema(description = "模糊查询字符串，主要用于移动端")
+    private String str;
 
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/renew/vo/OaRenewPageReqVO.java

@@ -54,5 +54,7 @@ public class OaRenewPageReqVO extends PageParam {
     @Schema(description = "用户id")
     private Long userId;
 
+    @Schema(description = "模糊查询字符串，主要用于移动端")
+    private String str;
 
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/conversion/OaConversionMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionPageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.conversion.OaConversionDO;
 import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -28,6 +29,16 @@ public interface OaConversionMapper extends BaseMapperX<OaConversionDO> {
                 .betweenIfPresent(OaConversionDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(OaConversionDO::getAuditStatus, reqVO.getAuditStatus())
                 .orderByDesc(OaConversionDO::getId);
+        // 模糊查询信息：申请人、转正人、转正日期
+        String str = reqVO.getStr();
+        if (StringUtils.isNotBlank(str)) {
+            lambdaQueryWrapperX.and(wrapper ->
+                    wrapper.like(OaConversionDO::getApplyEmployeeName, str)
+                            .or()
+                            .like(OaConversionDO::getEmployeeName, str)
+                            .or()
+                            .like(OaConversionDO::getConversionDate, str));
+        }
         // 数据权限
         DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
         if (deptDataPermission != null) {

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/entry/OaEntryMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.entry.vo.OaEntryPageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.entry.OaEntryDO;
 import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 /**
  * 入职流程信息 Mapper
@@ -28,6 +29,16 @@ public interface OaEntryMapper extends BaseMapperX<OaEntryDO> {
                 .betweenIfPresent(OaEntryDO::getEntryDate, reqVO.getEntryDate())
                 .eqIfPresent(OaEntryDO::getAuditStatus, reqVO.getAuditStatus())
                 .orderByDesc(OaEntryDO::getId);
+        // 模糊查询信息：申请人、入职人、入职日期
+        String str = reqVO.getStr();
+        if (StringUtils.isNotBlank(str)) {
+            lambdaQueryWrapperX.and(wrapper ->
+                    wrapper.like(OaEntryDO::getApplyEmployeeName, str)
+                            .or()
+                            .like(OaEntryDO::getEntryName, str)
+                            .or()
+                            .like(OaEntryDO::getEntryDate, str));
+        }
         // 数据权限
         DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
         if (deptDataPermission != null) {

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/renew/OaRenewMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.renew.vo.OaRenewPageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.renew.OaRenewDO;
 import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -29,6 +30,14 @@ public interface OaRenewMapper extends BaseMapperX<OaRenewDO> {
                 .likeIfPresent(OaRenewDO::getApplyEmployeeName, reqVO.getApplyEmployeeName())
                 .betweenIfPresent(OaRenewDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(OaRenewDO::getId);
+        // 模糊查询信息：申请人、续签人
+        String str = reqVO.getStr();
+        if (StringUtils.isNotBlank(str)) {
+            lambdaQueryWrapperX.and(wrapper ->
+                    wrapper.like(OaRenewDO::getApplyEmployeeName, str)
+                            .or()
+                            .like(OaRenewDO::getEmployeeName, str));
+        }
         // 数据权限
         DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
         if (deptDataPermission != null) {