From e2800b1982d6dc004723674d71748de07fef6c6b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 30 Mar 2017 15:39:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/job/index/repository/ProductRepository.java | 2 +- .../com/lyms/platform/job/index/repository/SolrProductRepository.java | 2 +- .../java/com/lyms/platform/operate/web/facade/AreaCountFacade.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/repository/ProductRepository.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/repository/ProductRepository.java index 8ca46aa..2e28200 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/repository/ProductRepository.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/repository/ProductRepository.java @@ -26,7 +26,7 @@ public interface ProductRepository extends CrudRepository { Page findByPopularity(Integer popularity); - FacetPage findByNameStartingWithAndFacetOnAvailable(String namePrefix); + FacetPage findByName(String namePrefix); Page findByAvailableTrue(); diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/repository/SolrProductRepository.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/repository/SolrProductRepository.java index f109c74..279716b 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/repository/SolrProductRepository.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/repository/SolrProductRepository.java @@ -41,7 +41,7 @@ public class SolrProductRepository extends SimpleSolrRepository } @Override - public FacetPage findByNameStartingWithAndFacetOnAvailable(String namePrefix) { + public FacetPage findByName(String namePrefix) { FacetQuery query = new SimpleFacetQuery(new Criteria(SolrSearchableFields.NAME).startsWith(namePrefix)); query.setFacetOptions(new FacetOptions(SolrSearchableFields.AVAILABLE)); return getSolrOperations().queryForFacetPage(query, Product.class); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index be176c8..5db4c08 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -1352,7 +1352,7 @@ public class AreaCountFacade { end = page * limit; } - String countSql = "SELECT COUNT(C.NAME) AS ALLCOUNT FROM ODS_F_GRAVIDA_RECORD C INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID " + + String countSql = "SELECT COUNT(C.NAME) AS ALLCOUNT FROM ODS_F_GRAVIDA_RECORD C LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID " + " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO WHERE 1 = 1"; String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT C.CREATE_DATE,\n" + @@ -1366,7 +1366,7 @@ public class AreaCountFacade { " D.PROVINCE||D.CITY||D.AREA_COUNTY AS HJ_ADDR,\n" + " C.TEL_NO\n" + " FROM ODS_F_GRAVIDA_RECORD C\n" + - " INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"+ + " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"+ " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO "+ " WHERE 1 = 1"; if (StringUtils.isNotEmpty(time)) -- 1.8.3.1