|
|
@@ -51,8 +51,7 @@ public interface BusCustomerCompanyBusinessRepository extends JpaRepository<BusC
|
|
|
* 根据查询词搜索符合条件的客户公司业务 - 通过联合查询
|
|
|
* 查找CustomerType=2(船公司)且RecordStatus=1的记录,并支持模糊搜索
|
|
|
*/
|
|
|
- @Query(value = "SELECT new com.lianda.backend.dto.CustomerCompanyBusinessSearchResult(" +
|
|
|
- "ccb.CustomerCompanyBusinessId, cc.Name, ccb.BusinessCode) " +
|
|
|
+ @Query(value = "SELECT ccb.CustomerCompanyBusinessID, cc.Name, ccb.BusinessCode " +
|
|
|
"FROM Bus_CustomerCompanyBusiness ccb " +
|
|
|
"INNER JOIN Bus_CustomerCompany cc ON ccb.CustomerCompanyID = cc.CustomerCompanyID " +
|
|
|
"INNER JOIN Bus_Customer_CustomerType cct ON cc.CustomerCompanyID = cct.CustomerID " +
|
|
|
@@ -60,10 +59,13 @@ public interface BusCustomerCompanyBusinessRepository extends JpaRepository<BusC
|
|
|
"AND ccb.RecordStatus = 1 " +
|
|
|
"AND cc.RecordStatus = 1 " +
|
|
|
"AND (COALESCE(:query, '') = '' OR LOWER(ccb.BusinessCode) LIKE CONCAT('%', LOWER(:query), '%') OR LOWER(cc.Name) LIKE CONCAT('%', LOWER(:query), '%'))", nativeQuery = true)
|
|
|
- List<CustomerCompanyBusinessSearchResult> searchShippingCompanies(@Param("query") String query);
|
|
|
+ List<Object[]> searchShippingCompanies(@Param("query") String query);
|
|
|
|
|
|
- @Query(value = "SELECT new com.lianda.backend.dto.CustomerCompanyBusinessSearchResult(" +
|
|
|
- "ccb.CustomerCompanyBusinessId, cc.Name, ccb.BusinessCode) " +
|
|
|
+ /**
|
|
|
+ * 根据查询词搜索符合条件的客户公司业务 - 分页查询
|
|
|
+ * 查找CustomerType=2(船公司)且RecordStatus=1的记录,并支持模糊搜索
|
|
|
+ */
|
|
|
+ @Query(value = "SELECT ccb.CustomerCompanyBusinessID, cc.Name, ccb.BusinessCode " +
|
|
|
"FROM Bus_CustomerCompanyBusiness ccb " +
|
|
|
"INNER JOIN Bus_CustomerCompany cc ON ccb.CustomerCompanyID = cc.CustomerCompanyID " +
|
|
|
"INNER JOIN Bus_Customer_CustomerType cct ON cc.CustomerCompanyID = cct.CustomerID " +
|
|
|
@@ -71,5 +73,5 @@ public interface BusCustomerCompanyBusinessRepository extends JpaRepository<BusC
|
|
|
"AND ccb.RecordStatus = 1 " +
|
|
|
"AND cc.RecordStatus = 1 " +
|
|
|
"AND (COALESCE(:query, '') = '' OR LOWER(ccb.BusinessCode) LIKE CONCAT('%', LOWER(:query), '%') OR LOWER(cc.Name) LIKE CONCAT('%', LOWER(:query), '%'))", nativeQuery = true)
|
|
|
- Page<CustomerCompanyBusinessSearchResult> searchShippingCompaniesWithPage(@Param("query") String query, Pageable pageable);
|
|
|
+ Page<Object[]> searchShippingCompaniesWithPage(@Param("query") String query, Pageable pageable);
|
|
|
}
|