Browse Source

1、oa申请分页接口模糊查询信息:领用、采购

dongpo 4 months ago
parent
commit
1a25375a3e

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

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