| | |
| | | * @param fieldReference 参照 |
| | | * @param search 是否搜索 |
| | | */ |
| | | public void addField(String fieldName, String faceUuid, String columnName, String columnWidth, Integer sequence, String fieldReference, boolean search) { |
| | | public void addField(String fieldName, String faceUuid, String columnName, String columnWidth, Integer sequence, String fieldReference, boolean search, String format) { |
| | | FaceField faceField = new FaceField(); |
| | | faceField.setFieldName(fieldName); |
| | | faceField.setFieldUuid(faceUuid); |
| | |
| | | faceField.setSequence(sequence); |
| | | faceField.setFieldReference(fieldReference); |
| | | faceField.setSearch(search); |
| | | faceField.setFormat(format); |
| | | if (this.faceFields == null) { |
| | | this.faceFields = Lists.newArrayList(); |
| | | } |
| | |
| | | maps.put("filter", filters); |
| | | for (int i = 0; i < faceFields.size(); i++) { |
| | | FaceField faceField = faceFields.get(i); |
| | | |
| | | |
| | | if (!faceField.isSearch()) { |
| | | continue; |
| | | } |
| | |
| | | return fieldName; |
| | | } |
| | | //新方法 |
| | | private String getFieldName(Map<String, List<String>> tableAlias,Map<String, List<String>> aliasField, Map<String, List<String>> tableAndField, String fieldName) { |
| | | private String getFieldName(Map<String, List<String>> tableAlias,Map<String, List<String>> aliasField, Map<String, List<String>> tableAndField, String fieldName) { |
| | | String table=null; |
| | | boolean b=false; |
| | | if(tableAndField!=null && !tableAndField.isEmpty()) { |
| | | for(String key:tableAndField.keySet()) { |
| | | for(String field:tableAndField.get(key)) { |
| | | if(fieldName.equals(field)) { |
| | | |
| | | |
| | | List<String>alias=tableAlias.get(key); |
| | | if(alias!=null && !alias.isEmpty()) { |
| | | table=alias.get(0);//取第一个别名 |
| | |
| | | } |
| | | if(b)break; |
| | | } |
| | | |
| | | |
| | | if (fieldName.indexOf('.')<0 && !StringUtils.isEmpty(table)) { |
| | | return "`" + table + "`." + fieldName; |
| | | } |
| | |
| | | * 字段参照 |
| | | */ |
| | | private String fieldReference; |
| | | |
| | | /** |
| | | * 格式 |
| | | */ |
| | | private String format; |
| | | |
| | | private boolean search; |
| | | |
| | |
| | | public void setSearch(boolean search) { |
| | | this.search = search; |
| | | } |
| | | } |
| | | |
| | | public String getFormat() { |
| | | return format; |
| | | } |
| | | |
| | | public void setFormat(String format) { |
| | | this.format = format; |
| | | } |
| | | } |
| | | |
| | | |
| | | } |