iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/plan/item/collection/PlanItemCollector.java

@@ -2,6 +2,7 @@

import com.iailab.framework.tenant.core.context.DataContextHolder;
import com.iailab.module.data.common.utils.DateUtils;
import com.iailab.module.data.common.xss.SQLFilter;
import com.iailab.module.data.plan.data.entity.PlanDataSetEntity;
import com.iailab.module.data.plan.data.service.PlanDataSetService;
import com.iailab.module.data.plan.item.entity.PlanItemEntity;
@@ -44,6 +45,7 @@
            return null;
        }
        Map<String, Object> params = getSqlParams(dataSet, startTime, endTime);
        SQLFilter.sqlInject2(dataSet.getQuerySql());
        DataContextHolder.setDataSourceId(Long.valueOf(dataSet.getDataSource()));
        List<PlanItemDataVO> dataList = planItemService.getSourceValue(params);

@@ -93,10 +95,12 @@
        StringBuilder whereSql = new StringBuilder();
        String startStr = DateUtils.format(startTime, DateUtils.DATE_NUMBER_PATTERN);
        String endStr = DateUtils.format(endTime, DateUtils.DATE_NUMBER_PATTERN);
        whereSql.append(" plan_t.start_time <= ")
        whereSql.append(" plan_t.start_time <= '")
                .append(endStr)
                .append(" and plan_t.end_time >= ")
                .append(startStr);
                .append("'")
                .append(" and plan_t.end_time >= '")
                .append(startStr)
                .append("'");
        params.put("whereSql", whereSql.toString());
        return params;
    }