|
@ -402,7 +402,8 @@ public class EduArticleService {
|
|
" LEFT JOIN wlyy_patient p ON ap.patient = p.code " +
|
|
" LEFT JOIN wlyy_patient p ON ap.patient = p.code " +
|
|
" LEFT JOIN wlyy_admin_team t ON ap.admin_team_code = t.id" +
|
|
" LEFT JOIN wlyy_admin_team t ON ap.admin_team_code = t.id" +
|
|
" WHERE " +
|
|
" WHERE " +
|
|
" ap.admin_team_code IS NOT NULL GROUP BY ap.batch_no ORDER BY ap.czrq ASC ";
|
|
|
|
|
|
" ap.admin_team_code IS NOT NULL GROUP BY ap.batch_no ORDER BY createTime ASC ";
|
|
|
|
System.out.println("userType2========="+BartchNoSql);
|
|
List<Map<String,Object>> batchList = jdbcTemplate.queryForList(BartchNoSql);
|
|
List<Map<String,Object>> batchList = jdbcTemplate.queryForList(BartchNoSql);
|
|
List<HealthEduArticleES> batchEsList = new ArrayList<>();
|
|
List<HealthEduArticleES> batchEsList = new ArrayList<>();
|
|
if (batchList!=null && batchList.size()>0){
|
|
if (batchList!=null && batchList.size()>0){
|
|
@ -544,7 +545,7 @@ public class EduArticleService {
|
|
BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
|
|
BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
|
|
boolQueryBuilder.mustNot(QueryBuilders.matchQuery("userType",1));
|
|
boolQueryBuilder.mustNot(QueryBuilders.matchQuery("userType",1));
|
|
boolQueryBuilder.mustNot(QueryBuilders.matchQuery("userType",2));
|
|
boolQueryBuilder.mustNot(QueryBuilders.matchQuery("userType",2));
|
|
searchSourceBuilder.query(boolQueryBuilder).size(10000);//一次取10000条
|
|
|
|
|
|
searchSourceBuilder.query(boolQueryBuilder).size(100000);//一次取100000条
|
|
|
|
|
|
Search search = new Search.Builder(searchSourceBuilder.toString()).addIndex(esIndex).addType(esType)
|
|
Search search = new Search.Builder(searchSourceBuilder.toString()).addIndex(esIndex).addType(esType)
|
|
.build();
|
|
.build();
|