소스 검색

代码bug 调整

jkzlzhoujie 6 년 전
부모
커밋
ca6fac48ee
2개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      src/main/java/com/yihu/quota/etl/formula/AgeGroupFunc.java
  2. 2 2
      src/main/java/com/yihu/quota/service/view/ViewService.java

+ 1 - 1
src/main/java/com/yihu/quota/etl/formula/AgeGroupFunc.java

@ -35,7 +35,7 @@ public class AgeGroupFunc implements Functioner {
            return level_age_2;
        } else if (age <= AGE_40) {
            return level_age_3;
        } else if (age < AGE_65) {
        } else if (age <= AGE_65) {
            return level_age_4;
        } else {
            return level_age_5;

+ 2 - 2
src/main/java/com/yihu/quota/service/view/ViewService.java

@ -335,10 +335,10 @@ public class ViewService extends BaseJpaService<View, ViewDao> {
                    joinBoolQuery(boolQueryBuilder, queryBuilder, "not");
                }
                // 包含与否
                else if ("null".equals(filterModel.getCompareType())) {
                else if ("contain".equals(filterModel.getCompareType())) {
                    QueryBuilder queryBuilder = QueryBuilders.matchQuery(field, value);
                    joinBoolQuery(boolQueryBuilder, queryBuilder, filterModel.getRelationType());
                } else if ("not_null".equals(filterModel.getCompareType())) {
                } else if ("not_contain".equals(filterModel.getCompareType())) {
                    QueryBuilder queryBuilder = QueryBuilders.matchQuery(field, value);
                    joinBoolQuery(boolQueryBuilder, queryBuilder, "not");
                }