|
|
|
|
@ -99,10 +99,6 @@ namespace ZKLT.Hadoop
|
|
|
|
|
_wherestr.AppendLine(@$"AND `{_item.Name}` {_Itemv[k]} @{_guid}");
|
|
|
|
|
param.Add(_guid, $@"%{((JValue)_Colv[k]!).Value!}%");
|
|
|
|
|
break;
|
|
|
|
|
case HDP_WhereType.IN:
|
|
|
|
|
_wherestr.AppendLine(@$"AND `{_item.Name}` {_Itemv[k]} @{_guid}");
|
|
|
|
|
param.Add(_guid, _Colv[k]!);
|
|
|
|
|
break;
|
|
|
|
|
case HDP_WhereType.QUERYIN:
|
|
|
|
|
var _Command = JsonConvert.DeserializeObject<HDP_Command>(_Colv[k].ToString())!;
|
|
|
|
|
var _Query = QueryString(_Command.SourceId!, _Command.TableId!, _Command.Where, _Command.Data, _Command.Order, _Command.Col, param);
|
|
|
|
|
@ -114,10 +110,18 @@ namespace ZKLT.Hadoop
|
|
|
|
|
case HDP_WhereType.LESS:
|
|
|
|
|
case HDP_WhereType.MORETHEN:
|
|
|
|
|
case HDP_WhereType.LESSTHEN:
|
|
|
|
|
case HDP_WhereType.IN:
|
|
|
|
|
case HDP_WhereType.BETWEEN:
|
|
|
|
|
default:
|
|
|
|
|
_wherestr.AppendLine(@$"AND `{_item.Name}` {_Itemv[k]} @{_guid}");
|
|
|
|
|
param.Add(_guid, ((JValue)_Colv[k]!).Value!);
|
|
|
|
|
if (_Colv[k]!.Type == JTokenType.Object || _data[_item.Name]!.Type == JTokenType.Array)
|
|
|
|
|
{
|
|
|
|
|
param.Add(_guid, _Colv[k]!);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
param.Add(_guid, ((JValue)_Colv[k]!).Value!);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|