|
@@ -427,7 +427,7 @@ namespace Util
|
|
string field = column.ColumnName;
|
|
string field = column.ColumnName;
|
|
if(!dic.Any(m => m.FieldEnName == field)) dic.Add(new QueryCondition()
|
|
if(!dic.Any(m => m.FieldEnName == field)) dic.Add(new QueryCondition()
|
|
{
|
|
{
|
|
- FieldName = fieldDic[field],
|
|
|
|
|
|
+ FieldName = field,
|
|
FieldEnName = field,
|
|
FieldEnName = field,
|
|
Value = items.Rows[0][field].ToString()
|
|
Value = items.Rows[0][field].ToString()
|
|
});
|
|
});
|
|
@@ -1868,7 +1868,7 @@ namespace Util
|
|
Dictionary<string, object> prizeItem = new Dictionary<string, object>();
|
|
Dictionary<string, object> prizeItem = new Dictionary<string, object>();
|
|
prizeItem.Add("prize_date", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
|
|
prizeItem.Add("prize_date", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
|
|
prizeItem.Add("prize_name", sub.prizeName);
|
|
prizeItem.Add("prize_name", sub.prizeName);
|
|
- prizeItem.Add("prize_code", sub.prizeCode);
|
|
|
|
|
|
+ prizeItem.Add("prize_code", prizeCode);
|
|
prizeItem.Add("batch_no", batchNo);
|
|
prizeItem.Add("batch_no", batchNo);
|
|
prizeItem.Add("request_param_field", content);
|
|
prizeItem.Add("request_param_field", content);
|
|
List<Dictionary<string, object>> prizeItemList = new List<Dictionary<string, object>>();
|
|
List<Dictionary<string, object>> prizeItemList = new List<Dictionary<string, object>>();
|
|
@@ -2541,10 +2541,11 @@ namespace Util
|
|
foreach(Match m in mc)
|
|
foreach(Match m in mc)
|
|
{
|
|
{
|
|
string matchValue = m.Value.Replace("${", "").Replace("}", "");
|
|
string matchValue = m.Value.Replace("${", "").Replace("}", "");
|
|
- matchValue = getRequestParams(projectId, content, matchValue);
|
|
|
|
- matchValue = GetQueryTableData(dic, matchValue);
|
|
|
|
- matchValue = GetStartData(startData, matchValue);
|
|
|
|
- str = str.Replace(m.Value, matchValue);
|
|
|
|
|
|
+ string val = "";
|
|
|
|
+ if(string.IsNullOrEmpty(val) || val == "0") val = getRequestParams(projectId, content, matchValue);
|
|
|
|
+ if(string.IsNullOrEmpty(val) || val == "0") val = GetQueryTableData(dic, matchValue);
|
|
|
|
+ if(string.IsNullOrEmpty(val) || val == "0") val = GetStartData(startData, matchValue);
|
|
|
|
+ str = str.Replace(m.Value, val);
|
|
}
|
|
}
|
|
return str;
|
|
return str;
|
|
}
|
|
}
|