物流数据搜索优化

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/logistics/impl/LogisticsInfosServiceImpl.java

@@ -53,15 +53,16 @@ import java.util.stream.Collectors;
 @Service
 public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper, LogisticsInfos> implements LogisticsInfosService {
     @Autowired
-    CompanyInfoService companyInfoService;
+    private CompanyInfoService companyInfoService;
     @Autowired
-    LogisticsDetailsService logisticsDetailsService;
+    private LogisticsDetailsService logisticsDetailsService;
     @Autowired
-    PurchaseService purchaseService;
+    private PurchaseService purchaseService;
     @Autowired
-    JdBackService jdBackService;
+    private JdBackService jdBackService;
     @Autowired
-    JdBackDetailsService jdBackDetailsService;
+    private JdBackDetailsService jdBackDetailsService;
+
 
     @Override
     public Page<LogisticsInfosVo> getPage(LogisticsInfosSelectDto dto) {
@@ -70,10 +71,12 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
         wrapper.eq(LogisticsInfos::getLogisticsStatus, dto.getLogisticsStatus());
         wrapper.eq(LogisticsInfos::getStatus, dto.getStatus());
         if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
+            List<String> companyCodes = companyInfoService.listObject(CompanyInfo::getCode, q -> q.like(CompanyInfo::getName, dto.getKeyword()));
             wrapper.and(q -> q.like(LogisticsInfos::getCode, dto.getKeyword())
-                    .or().like(LogisticsInfos::getBusinessCode, dto.getKeyword()));
+                    .or().like(LogisticsInfos::getBusinessCode, dto.getKeyword())
+                    .or().in(LogisticsInfos::getLogisticsCompanyCode, companyCodes)
+            );
         }
-        wrapper.eq(LogisticsInfos::getCode, dto.getKeyword());
         wrapper.orderByDesc("li", LogisticsInfos::getId);
         Page<LogisticsInfosVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<LogisticsInfosVo> records = page.getRecords();