重写,在线开发删除接口
This commit is contained in:
@@ -179,20 +179,19 @@ public class RunService : IRunService, ITransient
|
||||
var jArr = JArray.Parse(entity.Tables);
|
||||
if (!input.station_code.IsNullOrWhiteSpace())
|
||||
{
|
||||
|
||||
|
||||
if (jArr?.FirstOrDefault()?.Value<string>("table") == "eqp_equipment")
|
||||
{
|
||||
sql += $" where station_code='{input.station_code}' or station_code=''";
|
||||
}
|
||||
}
|
||||
if (!input.process_code.IsNullOrWhiteSpace())
|
||||
{
|
||||
if (jArr?.FirstOrDefault()?.Value<string>("table") == "bas_process")
|
||||
{
|
||||
//sql += $" where station_code='{input.station_code}' or station_code=''";
|
||||
//sql += $" and station_code='{input.station_code}' or station_code=''";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
realList = _databaseService.GetInterFaceData(link, sql, input, templateInfo.ColumnData.Adapt<MainBeltViceQueryModel>(), new List<IConditionalModel>(), tableFieldKeyValue);
|
||||
|
||||
|
||||
@@ -2902,15 +2901,15 @@ public class RunService : IRunService, ITransient
|
||||
{
|
||||
jarr = JArray.Parse(itemValue);
|
||||
}
|
||||
|
||||
|
||||
// 多选时为模糊查询
|
||||
if (model.multiple)
|
||||
{
|
||||
if (jarr?.Children() != null && jarr?.Children().ToList().Count > 1)
|
||||
{
|
||||
var values = string.Join(",", jarr.ToList().Select(t => t.Value<string>()));
|
||||
conModels.Add(new ConditionalModel { FieldName= item.Key, ConditionalType= ConditionalType.In, FieldValue=values });
|
||||
|
||||
conModels.Add(new ConditionalModel { FieldName = item.Key, ConditionalType = ConditionalType.In, FieldValue = values });
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2934,7 +2933,7 @@ public class RunService : IRunService, ITransient
|
||||
{
|
||||
var values = string.Join(",", jarr.ToList().Select(t => t.Value<string>()));
|
||||
conModels.Add(new ConditionalModel { FieldName = item.Key, ConditionalType = ConditionalType.In, FieldValue = values });
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user