Kaynağa Gözat

1、oa申请分页接口模糊查询信息:离职、报销、用印

dongpo 4 ay önce
ebeveyn
işleme
6fc8e4e749

+ 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/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/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/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 ->