单证搜索

hx-sale/src/main/java/com/fjhx/sale/mapper/documents/DocumentsMapper.java

@@ -5,6 +5,7 @@ import com.fjhx.sale.entity.documents.po.Documents;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.documents.vo.DocumentsVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -21,6 +22,6 @@ public interface DocumentsMapper extends BaseMapper<Documents> {
     /**
      * 单证表分页
      */
-    Page<DocumentsVo> getPage(@Param("page") Page<Object> page, @Param("ew") QueryWrapper<Object> wrapper);
+    Page<DocumentsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Documents> wrapper);
 
 }

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsServiceImpl.java

@@ -43,6 +43,8 @@ import com.fjhx.sale.service.pack.PackDetailProductService;
 import com.fjhx.sale.service.pack.PackDetailService;
 import com.fjhx.sale.service.pack.PackShipmentService;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -109,8 +111,18 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
      */
     @Override
     public Page<DocumentsVo> getPage(DocumentsSelectDto dto) {
-        QueryWrapper<Object> wrapper = Wrappers.query();
-        wrapper.orderByDesc("d.create_time");
+        IWrapper<Documents> wrapper = getWrapper();
+        wrapper.orderByDesc("d",Documents::getCreateTime);
+        if (StringUtils.isNotEmpty(dto.getKeyword())) {
+            //归属公司
+            List<Long> corporationIds = corporationService.listObject(Corporation::getId, q -> q.like(Corporation::getName, dto.getKeyword()));
+            List<Long> customerIds = customerService.listObject(Customer::getId, q -> q.like(Customer::getName, dto.getKeyword()));
+            wrapper.and(q -> q
+                    .like("c", Contract::getCode, dto.getKeyword())
+                    .or().in("c", Contract::getSellCorporationId, corporationIds)
+                    .or().in("c", Contract::getBuyCorporationId, customerIds)
+            );
+        }
         Page<DocumentsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         //切换数据源
         DynamicDataSourceContextHolder.push(SourceConstant.COMMON);