|
@@ -590,7 +590,6 @@ namespace Util
|
|
|
var conditions = recursionStartConditionService.GetList(m => m.loopSetId == loopSet.id);
|
|
|
if(conditions.Count > 0)
|
|
|
{
|
|
|
- MergeCondiDic(condiDic, queryCondiDic);
|
|
|
int allCount = conditions.Count; //所有奖励条件数
|
|
|
int passCount = 0; //通过条件数
|
|
|
foreach(var condition in conditions)
|
|
@@ -798,8 +797,8 @@ namespace Util
|
|
|
}
|
|
|
else if(fieldQueryModel == "query_field")
|
|
|
{
|
|
|
- valLeft = GetComputeVal(condiDic, valLeft);
|
|
|
- valRight = GetComputeVal(condiDic, valRight);
|
|
|
+ valLeft = GetComputeVal(queryCondiDic, valLeft);
|
|
|
+ valRight = GetComputeVal(queryCondiDic, valRight);
|
|
|
if(fieldQueryValueType == "number")
|
|
|
{
|
|
|
if(!string.IsNullOrEmpty(valLeft) && !string.IsNullOrEmpty(valRight) && decimal.Parse(checkObj) >= decimal.Parse(Function.CheckNum(valLeft)) && decimal.Parse(Function.CheckNum(checkObj.ToString())) <= decimal.Parse(Function.CheckNum(valRight)))
|
|
@@ -1692,6 +1691,10 @@ namespace Util
|
|
|
{
|
|
|
condi += "'%" + fieldQueryValue + "%'";
|
|
|
}
|
|
|
+ else if(fieldQueryModel == "query_field")
|
|
|
+ {
|
|
|
+ condi += "'%" + GetQueryTableData(condiDic, fieldQueryValue) + "%'";
|
|
|
+ }
|
|
|
}
|
|
|
else if(fieldQueryKind == "2") //精确匹配
|
|
|
{
|
|
@@ -1706,6 +1709,10 @@ namespace Util
|
|
|
{
|
|
|
val = fieldQueryValue;
|
|
|
}
|
|
|
+ else if(fieldQueryModel == "query_field")
|
|
|
+ {
|
|
|
+ val = GetQueryTableData(condiDic, fieldQueryValue);
|
|
|
+ }
|
|
|
if(fieldQueryValueType == "text")
|
|
|
{
|
|
|
val = "'" + val + "'";
|
|
@@ -1747,6 +1754,20 @@ namespace Util
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ else if(fieldQueryModel == "query_field")
|
|
|
+ {
|
|
|
+ foreach(string sub in valList)
|
|
|
+ {
|
|
|
+ if(fieldQueryValueType == "text")
|
|
|
+ {
|
|
|
+ val += "'" + GetQueryTableData(condiDic, sub) + "',";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ val += GetQueryTableData(condiDic, sub) + ",";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
else if(fieldQueryModel == "db_field")
|
|
|
{
|
|
|
foreach(string sub in valList)
|