shiyunteng
1 天以前 8de09297dcc5393cc8542f29318b17f5696d4f8d
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/OutBoundController.java
@@ -1,5 +1,6 @@
package com.by4cloud.platformx.business.controller;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
@@ -7,6 +8,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.business.dto.OutBoundAddDTO;
import com.by4cloud.platformx.business.dto.OutBoundQueryDTO;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.entity.OutBound;
@@ -42,16 +44,19 @@
    /**
     * 分页查询
     * @param page 分页对象
     * @param outBound EPR出库记录
     * @param queryDTO EPR出库记录
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('business_outBound_view')" )
    public R getOutBoundPage(@ParameterObject Page page, @ParameterObject OutBound outBound) {
    public R getOutBoundPage(@ParameterObject Page page, @ParameterObject OutBoundQueryDTO queryDTO) {
        LambdaQueryWrapper<OutBound> wrapper = Wrappers.lambdaQuery();
      wrapper.like(StrUtil.isNotBlank(outBound.getBusGuestName()),OutBound::getBusGuestName,outBound.getBusGuestName());
      wrapper.like(StrUtil.isNotBlank(outBound.getSubjectMatterName()),OutBound::getSubjectMatterName,outBound.getSubjectMatterName());
      wrapper.like(StrUtil.isNotBlank(queryDTO.getBusGuestName()),OutBound::getBusGuestName,queryDTO.getBusGuestName());
      wrapper.like(StrUtil.isNotBlank(queryDTO.getSubjectMatterName()),OutBound::getSubjectMatterName,queryDTO.getSubjectMatterName());
      wrapper.like(StrUtil.isNotBlank(queryDTO.getBatchNumber()),OutBound::getBatchNumber,queryDTO.getBatchNumber());
      wrapper.ge(ObjUtil.isNotNull(queryDTO.getStartTime()),OutBound::getOutBoundTime,queryDTO.getStartTime());
      wrapper.le(ObjUtil.isNotNull(queryDTO.getEndTime()),OutBound::getOutBoundTime,queryDTO.getEndTime());
      wrapper.orderByDesc(OutBound::getCreateTime);
        return R.ok(outBoundService.pageByScope(page, wrapper));
    }