许鹏程
2024-11-18 09131ff8e95978711d7956b40484c4a03320b7b1
多子表字段
已修改1个文件
31 ■■■■■ 文件已修改
src/main/java/com/product/face/util/FaceUtil.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/face/util/FaceUtil.java
@@ -33,9 +33,15 @@
        Map<String, List<FieldSetEntity>> groupContainer = data.stream()
                .filter(item -> !StringUtils.isEmpty(item.getString(FaceConst.FIELD_PARENT_UUID))) //过滤 取子级
                .collect(Collectors.groupingBy(item -> item.getString(FaceConst.FIELD_PARENT_UUID))); //分组
        int maxFormId = 100;
        for (Map.Entry<String, List<FieldSetEntity>> entry : collect.entrySet()) {
            List<FieldSetEntity> propertyList = entry.getValue();
            JSONObject propertyJson = getPropertyJson(propertyList, groupContainer);
            Integer o = propertyJson.getInteger("~formId~");
            if (o != null && o > maxFormId) {
                maxFormId = o;
            }
            propertyJson.remove("~formId~");
            Boolean eventProperty = propertyJson.getBoolean("event_property");
            if (eventProperty != null && eventProperty && propertyJson.get("event_array") != null) {
                JSONArray eventArray = propertyJson.getJSONArray("event_array");
@@ -55,6 +61,7 @@
            result.add(propertyJson);
        }
        result.sort(Comparator.comparing(item -> item.getInteger(FaceConst.CONTROL_SEQUENCE)));
        face.setValue("maxFormId", maxFormId);
        return result;
    }
@@ -88,6 +95,16 @@
                        try {
                            JSONObject propertyJson = getPropertyJson(groupContainer.get(groupUuid), groupContainer);
                            property.put(propertyName, propertyJson);
                            if ("__config__".equals(propertyName)) {
                                String o = propertyJson.getString("formId");
                                if (NumberUtil.isNumber(o)) {
                                    Integer formId = property.getInteger("formId");
                                    if (formId == null || formId < NumberUtil.parseInt(o)) {
                                        property.put("~formId~", NumberUtil.parseInt(o));
                                    }
                                }
                                propertyJson.remove("~formId~");
                            }
                        } catch (Exception e) {
                            e.printStackTrace();
                            throw e;
@@ -98,7 +115,19 @@
                        if (propertyListChild != null && !propertyListChild.isEmpty()) {
                            List<Object> array = propertyListChild.stream()
                                    .collect(Collectors.groupingBy(item -> item.getString(FaceConst.FIELD_GROUP_UUID)))
                                    .values().stream().map(item -> getPropertyJson(item, groupContainer)).sorted(Comparator.comparing(item -> item.getInteger(FaceConst.CONTROL_SEQUENCE))).collect(Collectors.toList());
                                    .values().stream().map(item -> {
                                        JSONObject propertyJson = getPropertyJson(item, groupContainer);
                                        String o = propertyJson.getString("~formId~");
                                        if (NumberUtil.isNumber(o)) {
                                            Integer formId = property.getInteger("formId");
                                            if (formId == null || formId < NumberUtil.parseInt(o)) {
                                                property.put("~formId~", NumberUtil.parseInt(o));
                                            }
                                        }
                                        propertyJson.remove("~formId~");
                                        return propertyJson;
                                    }).sorted(Comparator.comparing(item -> item.getInteger(FaceConst.CONTROL_SEQUENCE))).collect(Collectors.toList());
                            property.put(propertyName, new JSONArray(array));
                        }