批量订单费用申请业务列表查询条件完善

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/batchOrderFeeApply/BatchOrderFeeApplyMapper.java

 package cn.iocoder.yudao.module.order.dal.mysql.batchOrderFeeApply;
 
 import java.util.*;
+
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQuery;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
@@ -11,6 +12,7 @@ import cn.iocoder.yudao.module.order.vo.batchOrderFeeApply.*;
 
 /**
  * 批量费用申请 Mapper
+ *
  * @author 系统管理员
  */
 @Mapper
@@ -18,12 +20,11 @@ public interface BatchOrderFeeApplyMapper extends AbstractMapper<BatchOrderFeeAp
     @Override
     default PageResult<BatchOrderFeeApplyDO> selectPage(PageVO page, Object object) {
         if (object instanceof BatchOrderFeeApplyQueryVO) {
-            BatchOrderFeeApplyQueryVO vo = (BatchOrderFeeApplyQueryVO)object;
+            BatchOrderFeeApplyQueryVO vo = (BatchOrderFeeApplyQueryVO) object;
             return selectPage(page, new LambdaQuery<BatchOrderFeeApplyDO>()
-                .eqIfPresent(BatchOrderFeeApplyDO::getNo, vo.getNo())
-                .eqIfPresent(BatchOrderFeeApplyDO::getDetails, vo.getDetails())
-                .eqIfPresent(BatchOrderFeeApplyDO::getReason, vo.getReason())
+                    .likeIfPresent(BatchOrderFeeApplyDO::getNo, vo.getNo())
                     .eqIfPresent(BatchOrderFeeApplyDO::getState, vo.getState())
+                    .inIfPresent(BatchOrderFeeApplyDO::getCreator, vo.getApplicantList())
                     .betweenIfPresent(BatchOrderFeeApplyDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
                     .orderByDesc(BatchOrderFeeApplyDO::getId));
         }
@@ -34,12 +35,11 @@ public interface BatchOrderFeeApplyMapper extends AbstractMapper<BatchOrderFeeAp
     @Override
     default List<BatchOrderFeeApplyDO> selectList(Object object) {
         if (object instanceof BatchOrderFeeApplyQueryVO) {
-            BatchOrderFeeApplyQueryVO vo = (BatchOrderFeeApplyQueryVO)object;
+            BatchOrderFeeApplyQueryVO vo = (BatchOrderFeeApplyQueryVO) object;
             return selectList(new LambdaQuery<BatchOrderFeeApplyDO>()
-                .eqIfPresent(BatchOrderFeeApplyDO::getNo, vo.getNo())
-                .eqIfPresent(BatchOrderFeeApplyDO::getDetails, vo.getDetails())
-                .eqIfPresent(BatchOrderFeeApplyDO::getReason, vo.getReason())
+                    .likeIfPresent(BatchOrderFeeApplyDO::getNo, vo.getNo())
                     .eqIfPresent(BatchOrderFeeApplyDO::getState, vo.getState())
+                    .inIfPresent(BatchOrderFeeApplyDO::getCreator, vo.getApplicantList())
                     .betweenIfPresent(BatchOrderFeeApplyDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
                     .orderByDesc(BatchOrderFeeApplyDO::getId));
         }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/batchOrderFeeApply/BatchOrderFeeApplyQueryVO.java

@@ -14,15 +14,12 @@ public class BatchOrderFeeApplyQueryVO {
     @ApiModelProperty(value = "编号")
     private String no;
 
-    @ApiModelProperty(value = "申请详情")
-    private String details;
-
-    @ApiModelProperty(value = "原因")
-    private String reason;
-
     @ApiModelProperty(value = "状态：0 已取消 1 申请中 2 已通过 3 已驳回")
     private Integer state;
 
+    @ApiModelProperty(value = "申请人(可以支持多个)")
+    private List<Long> applicantList;
+
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始创建时间")
     private Date beginCreateTime;