|
|
|
@ -477,7 +477,10 @@ public class SqlTask extends AbstractTask {
|
|
|
|
|
private SqlBinds getSqlAndSqlParamsMap(String sql) { |
|
|
|
|
Map<Integer, Property> sqlParamsMap = new HashMap<>(); |
|
|
|
|
StringBuilder sqlBuilder = new StringBuilder(); |
|
|
|
|
|
|
|
|
|
// new
|
|
|
|
|
// replace variable TIME with $[YYYYmmddd...] in sql when history run job and batch complement job
|
|
|
|
|
sql = ParameterUtils.replaceScheduleTime(sql, |
|
|
|
|
DateUtils.timeStampToDate(taskExecutionContext.getScheduleTime())); |
|
|
|
|
// combining local and global parameters
|
|
|
|
|
Map<String, Property> paramsMap = taskExecutionContext.getPrepareParamsMap(); |
|
|
|
|
|
|
|
|
@ -494,10 +497,6 @@ public class SqlTask extends AbstractTask {
|
|
|
|
|
sqlParameters.setTitle(title); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// new
|
|
|
|
|
// replace variable TIME with $[YYYYmmddd...] in sql when history run job and batch complement job
|
|
|
|
|
sql = ParameterUtils.replaceScheduleTime(sql, |
|
|
|
|
DateUtils.timeStampToDate(taskExecutionContext.getScheduleTime())); |
|
|
|
|
// special characters need to be escaped, ${} needs to be escaped
|
|
|
|
|
setSqlParamsMap(sql, rgex, sqlParamsMap, paramsMap, taskExecutionContext.getTaskInstanceId()); |
|
|
|
|
// Replace the original value in sql !{...} ,Does not participate in precompilation
|
|
|
|
|