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

@@ -60,7 +60,7 @@
        }
        result.setDataSource(indItem.getDataSource());
        StringBuilder selectSql = new StringBuilder();
        IndStatFuncEnum statFun = IndStatFuncEnum.getEumByCode(StringUtils.isBlank(indItem.getStatFunc())? IndStatFuncEnum.DEFAULT.getCode() : indItem.getStatFunc());
        IndStatFuncEnum statFun = IndStatFuncEnum.getEumByCode(StringUtils.isBlank(indItem.getStatFunc()) ? IndStatFuncEnum.DEFAULT.getCode() : indItem.getStatFunc());
        switch (statFun) {
            case AVG:
                selectSql.append("AVG(");
@@ -100,15 +100,13 @@

        // 拼接SELECT
        StringBuilder selectSql = new StringBuilder();
        if (StringUtils.isNotBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())){
        if (StringUtils.isNotBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())) {
            selectSql.append(indItem.getDimension());
            selectSql.append(", ");
            selectSql.append(result.getSelectSql());
        }
        else if(StringUtils.isBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())){
        } else if (StringUtils.isBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())) {
            selectSql.append(result.getSelectSql());
        }
        else{
        } else {
            selectSql.append(result.getSelectSql());
            selectSql.append(", ");
            selectSql.append(indItem.getTimeLabel());
@@ -161,6 +159,18 @@
                whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
                whereSql.append("'");
                break;
            case LAST_MONTH:
                calendar.add(Calendar.MONTH, -1); // 将当前日期减去一个月，得到上个月的日期
                whereSql.append(indItem.getTimeLabel());
                whereSql.append(" >= '");
                whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON)); // 上个月的第一天
                calendar.add(Calendar.MONTH, 1); // 再加一个月，回到当前月
                whereSql.append("' AND '");
                whereSql.append(indItem.getTimeLabel());
                whereSql.append("' < '");
                whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON)); // 当前月
                whereSql.append("'");
                break;
            case LAST_MONTH_12:
                whereSql.append(indItem.getTimeLabel());
                whereSql.append(" <= '");
@@ -211,14 +221,14 @@

        // 拼接GROUP
        StringBuilder groupSql = new StringBuilder();
        if (StringUtils.isNotBlank(indItem.getDimension())){
        if (StringUtils.isNotBlank(indItem.getDimension())) {
            groupSql.append(indItem.getDimension());
        }
        result.setGroupSql(groupSql.toString());

        // 拼接ORDER
        StringBuilder orderBySql = new StringBuilder();
        if (StringUtils.isNotBlank(indItem.getDimension()) && indItem.getDimension().equals(indItem.getTimeLabel())){
        if (StringUtils.isNotBlank(indItem.getDimension()) && indItem.getDimension().equals(indItem.getTimeLabel())) {
            orderBySql.append(indItem.getTimeLabel());
            result.setOrderBySql(orderBySql.toString());
        }