duhongyu 6 lat temu
rodzic
commit
0e6e50bb36

+ 2 - 0
codegit/CallCenterApi/CallCenterApi.BLL/CallCenterApi.BLL.csproj

@@ -64,6 +64,7 @@
64 64
     <Compile Include="T_Call_TaskTelNum.cs" />
65 65
     <Compile Include="T_Call_WorkOrder.cs" />
66 66
     <Compile Include="T_Call_ZBDH.cs" />
67
+    <Compile Include="T_Con_Conversation.cs" />
67 68
     <Compile Include="T_CTI_Task.cs" />
68 69
     <Compile Include="T_CTI_TaskAgent.cs" />
69 70
     <Compile Include="T_CTI_TaskDaily.cs" />
@@ -128,6 +129,7 @@
128 129
     <Compile Include="T_Wo_WorkOrderBase.cs" />
129 130
     <Compile Include="T_Wo_WorkOrderItem.cs" />
130 131
     <Compile Include="T_Wo_WorkOrderItem_New.cs" />
132
+    <Compile Include="T_Wo_WorkOrderNew.cs" />
131 133
     <Compile Include="T_Wo_WorkOrderTimeOut.cs" />
132 134
     <Compile Include="T_Wo_WorkOrder_Logs.cs" />
133 135
     <Compile Include="T_Wo_WorkOrder_Que_Map.cs" />

+ 2 - 0
codegit/CallCenterApi/CallCenterApi.DAL/CallCenterApi.DAL.csproj

@@ -64,6 +64,7 @@
64 64
     <Compile Include="T_Call_TaskTelNum.cs" />
65 65
     <Compile Include="T_Call_WorkOrder.cs" />
66 66
     <Compile Include="T_Call_ZBDH.cs" />
67
+    <Compile Include="T_Con_Conversation.cs" />
67 68
     <Compile Include="T_CTI_Task.cs" />
68 69
     <Compile Include="T_CTI_TaskAgent.cs" />
69 70
     <Compile Include="T_CTI_TaskDaily.cs" />
@@ -128,6 +129,7 @@
128 129
     <Compile Include="T_Wo_WorkOrderBase.cs" />
129 130
     <Compile Include="T_Wo_WorkOrderItem.cs" />
130 131
     <Compile Include="T_Wo_WorkOrderItem_New.cs" />
132
+    <Compile Include="T_Wo_WorkOrderNew.cs" />
131 133
     <Compile Include="T_Wo_WorkOrderTimeOut.cs" />
132 134
     <Compile Include="T_Wo_WorkOrder_Logs.cs" />
133 135
     <Compile Include="T_Wo_WorkOrder_Que_Map.cs" />

+ 4 - 0
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -175,6 +175,7 @@
175 175
     <Compile Include="Controllers\callout\CallOutController.cs" />
176 176
     <Compile Include="Controllers\callout\CallOutPlanController.cs" />
177 177
     <Compile Include="Controllers\callout\CallPlanController.cs" />
178
+    <Compile Include="Controllers\ConversationController.cs" />
178 179
     <Compile Include="Controllers\customer\CustomerController.cs" />
179 180
     <Compile Include="Controllers\customer\CustomerNewController.cs" />
180 181
     <Compile Include="Controllers\customer\RegionCategoryController.cs" />
@@ -259,6 +260,7 @@
259 260
     <Compile Include="Controllers\workorder\WoBillController.cs" />
260 261
     <Compile Include="Controllers\workorder\WorkOrderController.cs" />
261 262
     <Compile Include="Controllers\workorder\WorkOrderLogsController.cs" />
263
+    <Compile Include="Controllers\workorder\WorkOrderNewController.cs" />
262 264
     <Compile Include="Controllers\workorder\WorkTypeController.cs" />
263 265
     <Compile Include="Global.asax.cs">
264 266
       <DependentUpon>Global.asax</DependentUpon>
@@ -354,6 +356,7 @@
354 356
     <Folder Include="Views\CallPlan\" />
355 357
     <Folder Include="Views\Callrecords\" />
356 358
     <Folder Include="Views\CeShi\" />
359
+    <Folder Include="Views\Conversation\" />
357 360
     <Folder Include="Views\CustomerNew\" />
358 361
     <Folder Include="Views\Customer\" />
359 362
     <Folder Include="Views\DaysTalkTime\" />
@@ -413,6 +416,7 @@
413 416
     <Folder Include="Views\Workcalendar\" />
414 417
     <Folder Include="Views\WorkOffDays\" />
415 418
     <Folder Include="Views\WorkOrderLogs\" />
419
+    <Folder Include="Views\WorkOrderNew\" />
416 420
     <Folder Include="Views\WorkOrdersComplaintType\" />
417 421
     <Folder Include="Views\WorkOrdersHandledRate\" />
418 422
     <Folder Include="Views\WorkOrdersType\" />

+ 25 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -14,7 +14,7 @@ namespace CallCenterApi.Interface.Controllers.tel
14 14
     public class CallrecordsController : BaseController
15 15
     {
16 16
         //获取通话记录列表
17
-        public ActionResult GetList(string phone, string usercode)
17
+        public ActionResult GetList(string phone, string usercode,int type=0)
18 18
         {
19 19
             //ActionResult res = NoToken("未知错误,请重新登录");
20 20
             //if (Request.IsAuthenticated)
@@ -135,6 +135,18 @@ namespace CallCenterApi.Interface.Controllers.tel
135 135
             {
136 136
                 sql += " and CallType='" + calltype + "'";
137 137
             }
138
+            if (type > 0)
139
+            {
140
+                if (!string.IsNullOrEmpty (GetConverTelephone(type)) )
141
+                {
142
+                    sql += " and CallNumber in (" + GetConverTelephone(type) + ")";
143
+                }
144
+                else
145
+                {
146
+                    return Success("暂无记录");
147
+                }
148
+               
149
+            }
138 150
             if (starttime.Trim() != "")
139 151
             {
140 152
                 sql += " and datediff(day,BeginTime,'" + starttime + "')<=0 ";
@@ -143,6 +155,7 @@ namespace CallCenterApi.Interface.Controllers.tel
143 155
             {
144 156
                 sql += " and datediff(day,BeginTime,'" + endtime + "')>=0 ";
145 157
             }
158
+           
146 159
 
147 160
             if (strpageindex.Trim() != "")
148 161
             {
@@ -206,7 +219,18 @@ namespace CallCenterApi.Interface.Controllers.tel
206 219
 
207 220
             return Content(obj.ToJson());
208 221
         }
222
+        /// <summary>
223
+        /// 获取三方通话或一键转接号码
224
+        /// </summary>
225
+        /// <returns></returns>
226
+        public string GetConverTelephone(int  type)
227
+        {
228
+            string str = string.Empty;
229
+
230
+            str = "select F_Telephone from T_Con_Conversation where F_IsDelete=0  and F_Type= "+ type;
209 231
 
232
+            return str;
233
+        }
210 234
         //通话记录导出
211 235
         public ActionResult GetListExpt(string phone, string usercode)
212 236
         {

+ 1 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

@@ -17,7 +17,7 @@
17 17
     <add key="smssign" value=""/>
18 18
   </appSettings>
19 19
   <connectionStrings>
20
-    <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_SanYuanCW;"/>
20
+    <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_YiHeSF;"/>
21 21
   </connectionStrings>
22 22
   <system.web>
23 23
     <compilation debug="true" targetFramework="4.5"/>

+ 2 - 0
codegit/CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj

@@ -70,6 +70,7 @@
70 70
     <Compile Include="T_Call_TaskTelNumRes.cs" />
71 71
     <Compile Include="T_Call_WorkOrder.cs" />
72 72
     <Compile Include="T_Call_ZBDH.cs" />
73
+    <Compile Include="T_Con_Conversation.cs" />
73 74
     <Compile Include="T_CTI_Task.cs" />
74 75
     <Compile Include="T_CTI_TaskAgent.cs" />
75 76
     <Compile Include="T_CTI_TaskDaily.cs" />
@@ -134,6 +135,7 @@
134 135
     <Compile Include="T_Wo_WorkOrderBase.cs" />
135 136
     <Compile Include="T_Wo_WorkOrderItem.cs" />
136 137
     <Compile Include="T_Wo_WorkOrderItem_New.cs" />
138
+    <Compile Include="T_Wo_WorkOrderNew.cs" />
137 139
     <Compile Include="T_Wo_WorkOrderTimeOut.cs" />
138 140
     <Compile Include="T_Wo_WorkOrder_Logs.cs" />
139 141
     <Compile Include="T_Wo_WorkOrder_Que_Map.cs" />