|
|
@@ -137,7 +137,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.AutoDial
|
|
137
|
137
|
[HttpPost("addmiddleware")]
|
|
138
|
138
|
public async Task<IActionResult> Addmiddleware()
|
|
139
|
139
|
{
|
|
140
|
|
- string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
|
|
|
140
|
+ string user ="8000";
|
|
141
|
141
|
List<IConditionalModel> conModels = new List<IConditionalModel>();
|
|
142
|
142
|
conModels.Add(new ConditionalModel() { FieldName = "F_IsDelete", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumUserCountState.Enabled).ToString() });
|
|
143
|
143
|
conModels.Add(new ConditionalCollections()
|
|
|
@@ -148,8 +148,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.AutoDial
|
|
148
|
148
|
new KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Type", ConditionalType = ConditionalType.Equal , FieldValue = "0" })
|
|
149
|
149
|
}
|
|
150
|
150
|
});
|
|
151
|
|
- conModels.Add(new ConditionalModel() { FieldName = "F_StartTime", ConditionalType = ConditionalType.GreaterThan , FieldValue = DateTime .Now .ToString() });
|
|
152
|
|
- conModels.Add(new ConditionalModel() { FieldName = "F_EndTime", ConditionalType = ConditionalType.LessThanOrEqual , FieldValue = DateTime.Now.ToString() });
|
|
|
151
|
+ conModels.Add(new ConditionalModel() { FieldName = "F_StartTime", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = DateTime .Now .ToString() });
|
|
|
152
|
+ conModels.Add(new ConditionalModel() { FieldName = "F_EndTime", ConditionalType = ConditionalType.GreaterThan, FieldValue = DateTime.Now.ToString() });
|
|
153
|
153
|
conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal , FieldValue = "1" });
|
|
154
|
154
|
var list = await _sys_outboundTaskrepository.GetListALL (conModels, " F_AddTime desc");
|
|
155
|
155
|
int n = 0;
|
|
|
@@ -165,26 +165,27 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.AutoDial
|
|
165
|
165
|
conModel.Add(new ConditionalModel() { FieldName = "F_Parentid", ConditionalType = ConditionalType.Equal, FieldValue = it.F_ID .ToString() });
|
|
166
|
166
|
conModel.Add(new ConditionalModel() { FieldName = "F_ISOutbound", ConditionalType = ConditionalType.Equal, FieldValue = "0" });
|
|
167
|
167
|
#endregion
|
|
168
|
|
- var modellist = await _sys_autodialrepository.GetListALL (conModels, " F_ID asc");
|
|
|
168
|
+ var modellist = await _sys_autodialrepository.GetListALL (conModel, " F_ID asc");
|
|
169
|
169
|
if (modellist!=null )
|
|
170
|
170
|
{
|
|
171
|
171
|
foreach (var iv in modellist)
|
|
172
|
172
|
{
|
|
173
|
|
- task tasks = new task();
|
|
174
|
|
- tasks.agent = user;
|
|
175
|
|
- tasks.number = iv .F_Tel ;
|
|
176
|
|
- tasks.state =0;
|
|
177
|
|
- tasks.type = it .F_Type ;
|
|
178
|
|
- tasks.content = it.F_Content ;
|
|
179
|
|
- tasks.outbound_id = iv .F_ID ;
|
|
180
|
|
- tasks.status = 0;
|
|
181
|
|
- var res = await _taskrepository.Add (tasks);
|
|
182
|
|
- if (res>0)
|
|
|
173
|
+ var model = await _taskrepository.GetListALL(x => x.outbound_id == iv.F_ID);
|
|
|
174
|
+ if (model==null || model.Count <=0)
|
|
183
|
175
|
{
|
|
184
|
|
- n= n + 1;
|
|
185
|
|
-
|
|
|
176
|
+ task tasks = new task();
|
|
|
177
|
+ tasks.agent = user;
|
|
|
178
|
+ tasks.number = iv.F_Tel;
|
|
|
179
|
+ tasks.state = 0;
|
|
|
180
|
+ tasks.type = it.F_Type;
|
|
|
181
|
+ tasks.content = it.F_Content;
|
|
|
182
|
+ tasks.outbound_id = iv.F_ID;
|
|
|
183
|
+ tasks.status = 0;
|
|
|
184
|
+ var res = await _taskrepository.Add(tasks);
|
|
|
185
|
+
|
|
186
|
186
|
}
|
|
187
|
187
|
}
|
|
|
188
|
+ n = modellist.Count ();
|
|
188
|
189
|
}
|
|
189
|
190
|
}
|
|
190
|
191
|
if (n >0)
|