4 次代码提交 d751f3ce5f ... 6fc8e4e749

作者 SHA1 备注 提交日期
  dongpo 6fc8e4e749 1、oa申请分页接口模糊查询信息:离职、报销、用印 1 年之前
  dongpo 1a25375a3e 1、oa申请分页接口模糊查询信息:领用、采购 1 年之前
  dongpo 6ddeb17771 1、oa申请分页接口模糊查询信息:请假、出差、公务外出 1 年之前
  dongpo b67580df66 1、oa申请分页接口模糊查询信息:入职、转正、续签 1 年之前
共有 23 个文件被更改,包括 155 次插入10 次删除
  1. 2 1
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/business/vo/OaBusinessPageReqVO.java
  2. 7 4
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/conversion/vo/OaConversionPageReqVO.java
  3. 7 2
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/entry/vo/OaEntryPageReqVO.java
  4. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/expense/vo/OaExpensePageReqVO.java
  5. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/leave/vo/OaLeavePageReqVO.java
  6. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/out/vo/OaOutPageReqVO.java
  7. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/purchase/vo/OaPurchasePageReqVO.java
  8. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/receive/vo/OaReceivePageReqVO.java
  9. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/renew/vo/OaRenewPageReqVO.java
  10. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/stamp/vo/OaStampPageReqVO.java
  11. 7 2
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/turnover/vo/OaTurnoverPageReqVO.java
  12. 11 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/business/OaBusinessMapper.java
  13. 11 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/conversion/OaConversionMapper.java
  14. 11 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/entry/OaEntryMapper.java
  15. 11 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/expense/OaExpenseMapper.java
  16. 11 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/leave/OaLeaveMapper.java
  17. 11 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/out/OaOutMapper.java
  18. 9 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/purchase/OaPurchaseMapper.java
  19. 11 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/receive/OaReceiveMapper.java
  20. 9 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/renew/OaRenewMapper.java
  21. 11 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/stamp/OaStampMapper.java
  22. 11 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/turnover/OaTurnOverMapper.java
  23. 1 1
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/universal/OaUniversalMapper.java

+ 2 - 1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/business/vo/OaBusinessPageReqVO.java

@@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -58,5 +57,7 @@ public class OaBusinessPageReqVO extends PageParam {
     @Schema(description = "用户id")
     private Long userId;
 
+    @Schema(description = "模糊查询字符串,主要用于移动端")
+    private String str;
 
 }

+ 7 - 4
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;
 
 }

+ 7 - 2
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;
 
 }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/expense/vo/OaExpensePageReqVO.java

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

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/leave/vo/OaLeavePageReqVO.java

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

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/out/vo/OaOutPageReqVO.java

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

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/purchase/vo/OaPurchasePageReqVO.java

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

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/receive/vo/OaReceivePageReqVO.java

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

+ 2 - 0
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;
 
 }

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/stamp/vo/OaStampPageReqVO.java

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

+ 7 - 2
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/turnover/vo/OaTurnoverPageReqVO.java

@@ -1,10 +1,13 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.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;
@@ -48,5 +51,7 @@ public class OaTurnoverPageReqVO extends PageParam {
     @Schema(description = "用户id")
     private Long userId;
 
+    @Schema(description = "模糊查询字符串,主要用于移动端")
+    private String str;
 
 }

+ 11 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/business/OaBusinessMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.business.vo.OaBusinessPageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.business.OaBusinessDO;
 import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -31,6 +32,16 @@ public interface OaBusinessMapper extends BaseMapperX<OaBusinessDO> {
                 .likeIfPresent(OaBusinessDO::getApplyEmployeeName, reqVO.getApplyEmployeeName())
                 .betweenIfPresent(OaBusinessDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(OaBusinessDO::getId);
+        // 模糊查询信息:申请人applyEmployeeName、出差人employeeName、出差目的地destination
+        String str = reqVO.getStr();
+        if (StringUtils.isNotBlank(str)) {
+            lambdaQueryWrapperX.and(wrapper ->
+                    wrapper.like(OaBusinessDO::getApplyEmployeeName, str)
+                            .or()
+                            .like(OaBusinessDO::getEmployeeName, str)
+                            .or()
+                            .like(OaBusinessDO::getDestination, str));
+        }
         // 数据权限
         DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
         if (deptDataPermission != null) {

+ 11 - 0
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) {

+ 11 - 0
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) {

+ 11 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/expense/OaExpenseMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.expense.vo.OaExpensePageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.expense.OaExpenseDO;
 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 OaExpenseMapper extends BaseMapperX<OaExpenseDO> {
                 .likeIfPresent(OaExpenseDO::getApplyEmployeeName, reqVO.getApplyEmployeeName())
                 .betweenIfPresent(OaExpenseDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(OaExpenseDO::getId);
+        // 模糊查询信息:申请人applyEmployeeName、报销人employeeName、报销总金额totalMoney
+        String str = reqVO.getStr();
+        if (StringUtils.isNotBlank(str)) {
+            lambdaQueryWrapperX.and(wrapper ->
+                    wrapper.like(OaExpenseDO::getApplyEmployeeName, str)
+                            .or()
+                            .like(OaExpenseDO::getEmployeeName, str)
+                            .or()
+                            .like(OaExpenseDO::getTotalMoney, str));
+        }
         // 数据权限
         DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
         if (deptDataPermission != null) {

+ 11 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/leave/OaLeaveMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.OaLeavePageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.leave.OaLeaveDO;
 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,16 @@ public interface OaLeaveMapper extends BaseMapperX<OaLeaveDO> {
                 .eqIfPresent(OaLeaveDO::getAuditStatus, reqVO.getAuditStatus())
                 .betweenIfPresent(OaLeaveDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(OaLeaveDO::getId);
+        // 模糊查询信息:申请人applyEmployeeName、请假人employeeName、请假天数day
+        String str = reqVO.getStr();
+        if (StringUtils.isNotBlank(str)) {
+            lambdaQueryWrapperX.and(wrapper ->
+                    wrapper.like(OaLeaveDO::getApplyEmployeeName, str)
+                            .or()
+                            .like(OaLeaveDO::getEmployeeName, str)
+                            .or()
+                            .like(OaLeaveDO::getDay, str));
+        }
         // 数据权限
         DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
         if (deptDataPermission != null) {

+ 11 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/out/OaOutMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.out.vo.OaOutPageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.out.OaOutDO;
 import cn.iocoder.yudao.module.system.api.permission.dto.DeptDataPermissionRespDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -30,6 +31,16 @@ public interface OaOutMapper extends BaseMapperX<OaOutDO> {
                 .likeIfPresent(OaOutDO::getApplyEmployeeName, reqVO.getApplyEmployeeName())
                 .betweenIfPresent(OaOutDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(OaOutDO::getId);
+        // 模糊查询字段:申请人applyEmployeeName、外出人employeeName、外出地点destination
+        String str = reqVO.getStr();
+        if (StringUtils.isNotBlank(str)) {
+            lambdaQueryWrapperX.and(wrapper ->
+                    wrapper.like(OaOutDO::getApplyEmployeeName, str)
+                            .or()
+                            .like(OaOutDO::getEmployeeName, str)
+                            .or()
+                            .like(OaOutDO::getDestination, str));
+        }
         // 数据权限
         DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
         if (deptDataPermission != null) {

+ 9 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/purchase/OaPurchaseMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.purchase.vo.OaPurchasePageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.purchase.OaPurchaseDO;
 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,14 @@ public interface OaPurchaseMapper extends BaseMapperX<OaPurchaseDO> {
                 .likeIfPresent(OaPurchaseDO::getApplyEmployeeName, reqVO.getApplyEmployeeName())
                 .betweenIfPresent(OaPurchaseDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(OaPurchaseDO::getId);
+        // 模糊查询信息:申请人applyEmployeeName、预期供应商supplierName
+        String str = reqVO.getStr();
+        if (StringUtils.isNotBlank(str)) {
+            lambdaQueryWrapperX.and(wrapper ->
+                    wrapper.like(OaPurchaseDO::getApplyEmployeeName, str)
+                            .or()
+                            .like(OaPurchaseDO::getSupplierName, str));
+        }
         // 数据权限
         DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
         if (deptDataPermission != null) {

+ 11 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/receive/OaReceiveMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.receive.vo.OaReceivePageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.receive.OaReceiveDO;
 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 OaReceiveMapper extends BaseMapperX<OaReceiveDO> {
                 .likeIfPresent(OaReceiveDO::getApplyEmployeeName, reqVO.getApplyEmployeeName())
                 .betweenIfPresent(OaReceiveDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(OaReceiveDO::getId);
+        // 模糊查询信息:申请人applyEmployeeName、领用人employeeName、领用日期receiveDate
+        String str = reqVO.getStr();
+        if (StringUtils.isNotBlank(str)) {
+            lambdaQueryWrapperX.and(wrapper ->
+                    wrapper.like(OaReceiveDO::getApplyEmployeeName, str)
+                            .or()
+                            .like(OaReceiveDO::getEmployeeName, str)
+                            .or()
+                            .like(OaReceiveDO::getReceiveDate, str));
+        }
         // 数据权限
         DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
         if (deptDataPermission != null) {

+ 9 - 0
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) {

+ 11 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/stamp/OaStampMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo.OaStampPageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.stamp.OaStampDO;
 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 OaStampMapper extends BaseMapperX<OaStampDO> {
                 .likeIfPresent(OaStampDO::getApplyEmployeeName, reqVO.getApplyEmployeeName())
                 .betweenIfPresent(OaStampDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(OaStampDO::getId);
+        // 模糊查询信息:申请人applyEmployeeName、用印人employeeName、用印标题stampTitle
+        String str = reqVO.getStr();
+        if (StringUtils.isNotBlank(str)) {
+            lambdaQueryWrapperX.and(wrapper ->
+                    wrapper.like(OaStampDO::getApplyEmployeeName, str)
+                            .or()
+                            .like(OaStampDO::getEmployeeName, str)
+                            .or()
+                            .like(OaStampDO::getStampTitle, str));
+        }
         // 数据权限
         DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
         if (deptDataPermission != null) {

+ 11 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/turnover/OaTurnOverMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverPageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.turnover.OaTurnoverDO;
 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 OaTurnOverMapper extends BaseMapperX<OaTurnoverDO> {
                 .likeIfPresent(OaTurnoverDO::getApplyEmployeeName, reqVO.getApplyEmployeeName())
                 .betweenIfPresent(OaTurnoverDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(OaTurnoverDO::getId);
+        // 模糊查询信息:申请人、离职人、离职日期
+        String str = reqVO.getStr();
+        if (StringUtils.isNotBlank(str)) {
+            lambdaQueryWrapperX.and(wrapper ->
+                    wrapper.like(OaTurnoverDO::getApplyEmployeeName, str)
+                            .or()
+                            .like(OaTurnoverDO::getEmployeeName, str)
+                            .or()
+                            .like(OaTurnoverDO::getTurnoverDate, str));
+        }
         // 数据权限
         DeptDataPermissionRespDTO deptDataPermission = reqVO.getDeptDataPermission();
         if (deptDataPermission != null) {

+ 1 - 1
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/universal/OaUniversalMapper.java

@@ -29,7 +29,7 @@ public interface OaUniversalMapper extends BaseMapperX<OaUniversalDO> {
                 .betweenIfPresent(OaUniversalDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(OaUniversalDO::getId);
 
-        // 根据员工姓名、标题、描述模糊查询,主要用于移动端查询
+        // 模糊查询信息:申请人、标题、详细描述
         String str = reqVO.getStr();
         if (StringUtils.isNotBlank(str)) {
             lambdaQueryWrapperX.and(wrapper ->