6c
2025-12-25 d21683e1de10c218b465eb4a7af6e192bdcb00a0
列表数字,日期格式化
已修改2个文件
29 ■■■■ 文件已修改
src/main/java/com/product/face/entity/FaceListEntity.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/face/service/FaceCacheService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/face/entity/FaceListEntity.java
@@ -109,7 +109,7 @@
     * @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);
@@ -118,6 +118,7 @@
        faceField.setSequence(sequence);
        faceField.setFieldReference(fieldReference);
        faceField.setSearch(search);
        faceField.setFormat(format);
        if (this.faceFields == null) {
            this.faceFields = Lists.newArrayList();
        }
@@ -360,7 +361,7 @@
        maps.put("filter", filters);
        for (int i = 0; i < faceFields.size(); i++) {
            FaceField faceField = faceFields.get(i);
            if (!faceField.isSearch()) {
                continue;
            }
@@ -434,14 +435,14 @@
        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);//取第一个别名
@@ -471,7 +472,7 @@
            }
            if(b)break;
        }
        if (fieldName.indexOf('.')<0 && !StringUtils.isEmpty(table)) {
            return "`" + table + "`." + fieldName;
        }
@@ -508,6 +509,11 @@
         * 字段参照
         */
        private String fieldReference;
        /**
         * 格式
         */
        private String format;
        private boolean search;
@@ -566,7 +572,15 @@
        public void setSearch(boolean search) {
            this.search = search;
        }
    }
        public String getFormat() {
            return format;
        }
        public void setFormat(String format) {
            this.format = format;
        }
    }
}
src/main/java/com/product/face/service/FaceCacheService.java
@@ -174,13 +174,14 @@
            FieldSetEntity fieldInfo = BaseUtil.getSingleInfoByCache("表字段信息", new String[]{tableUuid, fieldName});
            String label = config.getString(FaceConst.FIELD_PROPERTY_LABEL);
            boolean search  = !"0".equals(config.getString("isSearch"));
            String format = config.getString("format");
            String fieldUuid = null;
            String fieldReference = null;
            if (!FieldSetEntity.isEmpty(fieldInfo)) {
                fieldUuid = fieldInfo.getString(FaceConst.UUID);
                fieldReference = fieldInfo.getString(FaceConst.FIELD_FIELD_REFERENCE);
            }
            faceListEntity.addField(fieldName, fieldUuid, label, !StringUtils.isEmpty(setWidth)? setWidth+"%" : null, i, fieldReference,search);
            faceListEntity.addField(fieldName, fieldUuid, label, !StringUtils.isEmpty(setWidth)? setWidth+"%" : null, i, fieldReference,search, format);
        }
        //验证表单中的字段是否存在
        if (faceListEntity != null && !CollectionUtil.isEmpty(faceListEntity.getFaceFields())) {