iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/IndItemCollector.java

@@ -61,24 +61,7 @@
                break;
        }
        // 考虑指标精度和转换系数
        if (!CollectionUtils.isEmpty(result)) {
            result.forEach(e -> {
                if (e != null) {
                    Object dataValue = e.getDataValue();
                    if (dataValue != null && dataValue instanceof Number) {
                        BigDecimal value = new BigDecimal(dataValue.toString());
                        if (indItem.getPrecision() != null) {
                            value = new BigDecimal(dataValue.toString()).setScale(indItem.getPrecision(), BigDecimal.ROUND_HALF_UP);
                        }
                        if (StringUtils.isNotBlank(indItem.getCoefficient())) {
                            value = value.multiply(new BigDecimal(indItem.getCoefficient()));
                        }
                        e.setDataValue(value.doubleValue());
                    }
                }

            });
        }
        handleResult(result,indItem);
        return result;
    }

@@ -102,6 +85,29 @@
            default:
                break;
        }
        // 考虑指标精度和转换系数
        handleResult(result,indItem);
        return result;
    }

    private void handleResult(List<IndItemValueVO> result, IndItemEntity indItem) {
        if (!CollectionUtils.isEmpty(result)) {
            result.forEach(e -> {
                if (e != null) {
                    Object dataValue = e.getDataValue();
                    if (dataValue != null && dataValue instanceof Number) {
                        BigDecimal value = new BigDecimal(dataValue.toString());
                        if (indItem.getPrecision() != null) {
                            value = new BigDecimal(dataValue.toString()).setScale(indItem.getPrecision(), BigDecimal.ROUND_HALF_UP);
                        }
                        if (StringUtils.isNotBlank(indItem.getCoefficient())) {
                            value = value.multiply(new BigDecimal(indItem.getCoefficient()));
                        }
                        e.setDataValue(value.doubleValue());
                    }
                }

            });
        }
    }
}