duhongyu лет назад: 5
Родитель
Сommit
ea09bfb931

+ 3 - 5
代码/TVShoppingCallCenter_ZLJ/Controllers/CallCenter/CallFunctionController.cs

68
             return Success("归属地加载成功", location);
68
             return Success("归属地加载成功", location);
69
 
69
 
70
         }
70
         }
71
-
71
+      
72
 
72
 
73
         /// <summary>
73
         /// <summary>
74
         /// 获取电话归属地
74
         /// 获取电话归属地
293
                     modelRecord.CallType =1;
293
                     modelRecord.CallType =1;
294
                     modelRecord.BeginTime = modelcdr.create_time;
294
                     modelRecord.BeginTime = modelcdr.create_time;
295
                     modelRecord.EndTime = modelcdr.end_time;
295
                     modelRecord.EndTime = modelcdr.end_time;
296
-                  //  modelRecord.CallState = modelcdr.is_answer;
297
-                
298
-                   
296
+                    //  modelRecord.CallState = modelcdr.is_answer;
299
                     modelRecord.Id =(int ) modelcdr.id;
297
                     modelRecord.Id =(int ) modelcdr.id;
300
-                   
298
+
301
                     modelRecord.FilePath = url + modelcdr.record_path;
299
                     modelRecord.FilePath = url + modelcdr.record_path;
302
                     if (string.IsNullOrEmpty(modelcdr.record_path) && !string.IsNullOrEmpty(modelcdr.record_path ))
300
                     if (string.IsNullOrEmpty(modelcdr.record_path) && !string.IsNullOrEmpty(modelcdr.record_path ))
303
                     {
301
                     {

+ 1 - 1
代码/TVShoppingCallCenter_ZLJ/Controllers/Order/KFOrderController.cs

228
             #region 条件筛选
228
             #region 条件筛选
229
 
229
 
230
 
230
 
231
-            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThan, FieldValue = "0" });
231
+           // conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThan, FieldValue = "0" });
232
 
232
 
233
             //状态
233
             //状态
234
             if (input.F_State > -2)
234
             if (input.F_State > -2)

+ 4 - 0
代码/TVShoppingCallCenter_ZLJ/Controllers/Order/KGOrderController.cs

73
                 conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = input.F_State.ToString() });
73
                 conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = input.F_State.ToString() });
74
 
74
 
75
             }
75
             }
76
+            else
77
+            {
78
+                conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.NoEqual, FieldValue = "0" });
79
+            }
76
 
80
 
77
             conModels.Add(new ConditionalCollections()
81
             conModels.Add(new ConditionalCollections()
78
             {
82
             {