liquanyu / regional-platform

Download as
Browse Code ยป

Commit e6547b57410f1a968ea0fd6f139d1a169ef5df59

Authored by jiangjiazhi
2 parents 251997049f 703291cd76
Exists in master and in 1 other branch dev

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-job-index/src/main/java/com/lyms/platform/job/index/repository/ProductRepository.java View file @ e6547b5
... ... @@ -26,7 +26,7 @@
26 26  
27 27 Page<Product> findByPopularity(Integer popularity);
28 28  
29   - FacetPage<Product> findByNameStartingWithAndFacetOnAvailable(String namePrefix);
  29 + FacetPage<Product> findByName(String namePrefix);
30 30  
31 31 Page<Product> findByAvailableTrue();
32 32  
platform-job-index/src/main/java/com/lyms/platform/job/index/repository/SolrProductRepository.java View file @ e6547b5
... ... @@ -41,7 +41,7 @@
41 41 }
42 42  
43 43 @Override
44   - public FacetPage<Product> findByNameStartingWithAndFacetOnAvailable(String namePrefix) {
  44 + public FacetPage<Product> findByName(String namePrefix) {
45 45 FacetQuery query = new SimpleFacetQuery(new Criteria(SolrSearchableFields.NAME).startsWith(namePrefix));
46 46 query.setFacetOptions(new FacetOptions(SolrSearchableFields.AVAILABLE));
47 47 return getSolrOperations().queryForFacetPage(query, Product.class);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java View file @ e6547b5
... ... @@ -456,9 +456,9 @@
456 456  
457 457 }
458 458 sql+=" ) AA ON C.RECORD_ID=AA.RECORD_ID " +
459   - "INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID ) A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start;
  459 + " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID ) A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start;
460 460 sqlCount+=" ) AA ON C.RECORD_ID=AA.RECORD_ID " +
461   - "INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID";
  461 + " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID";
462 462  
463 463 System.out.println("sql========="+sql);
464 464 System.out.println("sqlCount===="+sql);
... ... @@ -1352,7 +1352,7 @@
1352 1352 end = page * limit;
1353 1353 }
1354 1354  
1355   - 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 " +
  1355 + 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 " +
1356 1356 " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO WHERE 1 = 1";
1357 1357  
1358 1358 String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT C.CREATE_DATE,\n" +
... ... @@ -1366,7 +1366,7 @@
1366 1366 " D.PROVINCE||D.CITY||D.AREA_COUNTY AS HJ_ADDR,\n" +
1367 1367 " C.TEL_NO\n" +
1368 1368 " FROM ODS_F_GRAVIDA_RECORD C\n" +
1369   - " INNER JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"+
  1369 + " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID"+
1370 1370 " INNER JOIN ODS_D_HOSPITAL A ON C.HOSPITAL_NO=A.HOSPITAL_NO "+
1371 1371 " WHERE 1 = 1";
1372 1372 if (StringUtils.isNotEmpty(time))