APP查询条件修改

SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerJGServiceImpl.java

@@ -98,6 +98,18 @@ public class CustomerJGServiceImpl extends ServiceImpl<CustomerJGMapper, Custome
             customerQueryWrapper.lambda().like(CustomerJGEntity::getSupplierNm,customerPagination.getSupplierNm());
         }
 
+        if(StringUtil.isNotEmpty(customerPagination.getKeyword())){
+            customerNum++;
+            customerQueryWrapper.lambda().and(wq -> {
+                // 拼接sql
+                wq.like(CustomerJGEntity::getSupplierNm,customerPagination.getKeyword())
+                        .or()
+                        .like(CustomerJGEntity::getOrgName,customerPagination.getKeyword())
+                        .or()
+                        .like(CustomerJGEntity::getAddress,customerPagination.getKeyword());
+            });
+        }
+
         if(AllIdList.size()>0){
             customerQueryWrapper.lambda().in(CustomerJGEntity::getId, AllIdList);
         }

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java

@@ -92,7 +92,17 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
             poundlistNum++;
             poundlistQueryWrapper.lambda().like(PoundlistEntity::getMaterialName,poundlistPagination.getMaterialName());
         }
-
+        if(StringUtil.isNotEmpty(poundlistPagination.getKeyword())){
+            poundlistNum++;
+            poundlistQueryWrapper.lambda().and(wq -> {
+                // 拼接sql
+                wq.like(PoundlistEntity::getSupplierName,poundlistPagination.getKeyword())
+                        .or()
+                        .like(PoundlistEntity::getCustomerName,poundlistPagination.getKeyword())
+                        .or()
+                        .like(PoundlistEntity::getLicenseNo,poundlistPagination.getKeyword());
+            });
+        }
         if(AllIdList.size()>0){
             poundlistQueryWrapper.lambda().in(PoundlistEntity::getId, AllIdList);
         }

SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java

@@ -100,6 +100,17 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
             supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierName,supplierPagination.getSupplierName());
         }
 
+        if(StringUtil.isNotEmpty(supplierPagination.getKeyword())){
+            supplierNum++;
+            supplierQueryWrapper.lambda().and(wq -> {
+                // 拼接sql
+                wq.like(SupplierEntity::getSupplierName,supplierPagination.getKeyword())
+                        .or()
+                        .like(SupplierEntity::getCompanyName,supplierPagination.getKeyword())
+                        .or()
+                        .like(SupplierEntity::getAddress,supplierPagination.getKeyword());
+            });
+        }
         if(AllIdList.size()>0){
             supplierQueryWrapper.lambda().in(SupplierEntity::getId, AllIdList);
         }

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java

@@ -99,6 +99,16 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
             vehicleQueryWrapper.lambda().like(VehicleEntity::getDrivername,vehiclePagination.getDrivername());
         }
 
+        if(StringUtil.isNotEmpty(vehiclePagination.getKeyword())){
+            vehicleNum++;
+            vehicleQueryWrapper.lambda().and(wq -> {
+                // 拼接sql
+                wq.like(VehicleEntity::getDrivername,vehiclePagination.getKeyword())
+                        .or()
+                        .like(VehicleEntity::getTicketno,vehiclePagination.getKeyword());
+            });
+        }
+
         if(AllIdList.size()>0){
             vehicleQueryWrapper.lambda().in(VehicleEntity::getId, AllIdList);
         }