任务问卷增加固定项：姓名、住址、乡镇、固定电话等

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallOutPlanController.cs

@@ -10,6 +10,7 @@ using System.Data;
 using CallCenterApi.DB;
 using System.IO;
 using System.Data.SqlClient;
+using CallCenterApi.Interface.Models.Dto;
 
 namespace CallCenterApi.Interface.Controllers.callout
 {
@@ -680,12 +681,42 @@ namespace CallCenterApi.Interface.Controllers.callout
                 return Error("参数不正确");
             var model = otnBLL.GetModel(id);
             var paperid = 0;
+            var taskmodel = new CallPlanNewDto();
             if (model != null)
             {
+                
+                #region 绑定任务和客户信息
+                if (model.F_CusID != null)
+                {
+                    var cusmodel = cusBLL.GetModel(model.F_CusID.Value);
+                    if (cusmodel != null)
+                    {
+                        taskmodel.F_CusID = model.F_CusID.Value;//客户id                
+                        taskmodel.F_CityID = cusmodel.F_CityID.Value;//乡镇id                
+                        taskmodel.F_CusName = cusmodel.F_CustomerName;//客户姓名                
+                        taskmodel.F_Phone = cusmodel.F_Telephone;//号码                
+                        taskmodel.F_Telephone = cusmodel.F_Mobile;//手机号码        
+                        taskmodel.F_City = cusmodel.F_City;//乡镇   
+                    }
+                }
+                taskmodel.F_Id = model.F_Id;//号码id
+                taskmodel.F_TaskId = model.F_TaskId.Value;//任务id
+                taskmodel.F_HJJGId = model.F_HJJGId.Value;//呼叫结果id
+
+                if (!string.IsNullOrWhiteSpace(model.F_CusName))
+                    taskmodel.F_CusName = model.F_CusName;//客户姓名
+                if (!string.IsNullOrWhiteSpace(model.F_Phone))
+                    taskmodel.F_Phone = model.F_Phone;//号码
+                if (!string.IsNullOrWhiteSpace(model.ExpandVchField12))
+                    taskmodel.F_Address = model.ExpandVchField12;//住址
+                #endregion
                 var tmodel = otBLL.GetModel(model.F_TaskId.Value);
                 if (tmodel != null)
                 {
                     paperid = tmodel.F_PagerID.Value;
+
+                    taskmodel.F_TaskName = tmodel.F_TaskName;//任务名称                
+                    taskmodel.F_TaskRemark = tmodel.F_TaskRemark;//任务备注 
                 }
             }
 
@@ -694,7 +725,7 @@ namespace CallCenterApi.Interface.Controllers.callout
 
             var obj = new
             {
-                taskModel = model,
+                taskModel = taskmodel,
                 paperid = paperid
             };
             return Success("获取成功", obj);
@@ -839,12 +870,32 @@ namespace CallCenterApi.Interface.Controllers.callout
             var paperid = 0;
             if (model != null)
             {
-
-                //modelPhoneImport.F_CusName = dr[0].ToString();//客户名称
-                //modelPhoneImport.F_Phone = dr[1].ToString();//号码
-                //modelPhoneImport.ExpandVchField12 = dr[2].ToString();//地址
-
-                var cusmodel = cusBLL.GetModel(model.F_CusID.Value);
+                var taskmodel = new CallPlanNewDto();
+                #region 绑定任务和客户信息
+                if (model.F_CusID != null)
+                {
+                    var cusmodel = cusBLL.GetModel(model.F_CusID.Value);
+                    if (cusmodel != null)
+                    {
+                        taskmodel.F_CusID = model.F_CusID.Value;//客户id                
+                        taskmodel.F_CityID = cusmodel.F_CityID.Value;//乡镇id                
+                        taskmodel.F_CusName = cusmodel.F_CustomerName;//客户姓名                
+                        taskmodel.F_Phone = cusmodel.F_Telephone;//号码                
+                        taskmodel.F_Telephone = cusmodel.F_Mobile;//手机号码        
+                        taskmodel.F_City = cusmodel.F_City;//乡镇   
+                    }
+                }
+                taskmodel.F_Id = model.F_Id;//号码id
+                taskmodel.F_TaskId = model.F_TaskId.Value;//任务id
+                taskmodel.F_HJJGId = model.F_HJJGId.Value;//呼叫结果id
+
+                if (!string.IsNullOrWhiteSpace(model.F_CusName))
+                    taskmodel.F_CusName = model.F_CusName;//客户姓名
+                if (!string.IsNullOrWhiteSpace(model.F_Phone))
+                    taskmodel.F_Phone = model.F_Phone;//号码
+                if (!string.IsNullOrWhiteSpace(model.ExpandVchField12))
+                    taskmodel.F_Address = model.ExpandVchField12;//住址
+                #endregion
 
                 var anslist = ansBLL.GetModelList(" F_TaskID=" + model.F_TaskId.Value + " and F_CusTelID=" + id + " ");
                 var tmodel = otBLL.GetModel(model.F_TaskId.Value);
@@ -898,18 +949,14 @@ namespace CallCenterApi.Interface.Controllers.callout
                         })
                     };
                     #endregion
+
+                    
+                    taskmodel.F_TaskName = tmodel.F_TaskName;//任务名称                
+                    taskmodel.F_TaskRemark = tmodel.F_TaskRemark;//任务备注                
+                    
                     var objy = new
                     {
-                        cusModel = new
-                        {
-                            cusname = cusmodel.F_CustomerName,
-                            telphone = cusmodel.F_Mobile,
-                            phone = cusmodel.F_Telephone,
-                            country = cusmodel.F_City,
-                            countryid = cusmodel.F_CityID,
-                            address = cusmodel.F_Address
-                        },
-                        taskModel = model,
+                        taskModel = taskmodel,
                         paperModel = newmodel
                     };
                     return Success("获取详情成功", objy);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Dto/CallPlan.cs

@@ -34,4 +34,47 @@ namespace CallCenterApi.Interface.Models.Dto
         public int connectedagentcount { get; set; }
         public string connectedagentrate { get; set; }
     }
+
+    public class CallPlanNewDto
+    {
+        //F_CusName
+        //F_Phone
+        //F_CusID
+        //F_Id
+        //F_TaskId
+        //F_HJJGId
+        //F_TaskName
+        //F_TaskRemark
+        //    cusname = cusmodel.F_CustomerName,
+        //    telphone = cusmodel.F_Mobile,
+        //    phone = cusmodel.F_Telephone,
+        //    country = cusmodel.F_City,
+        //    countryid = cusmodel.F_CityID,
+        //    address = cusmodel.F_Address
+
+        //号码id
+        public int F_Id { get; set; }
+        //任务id
+        public int F_TaskId { get; set; }
+        //呼叫结果id
+        public int F_HJJGId { get; set; }
+        //客户id
+        public int F_CusID { get; set; }
+        //乡镇id
+        public int F_CityID { get; set; }
+        //客户姓名
+        public string F_CusName { get; set; }
+        //固定电话
+        public string F_Phone { get; set; }
+        //手机号码
+        public string F_Telephone { get; set; }
+        //任务名称
+        public string F_TaskName { get; set; }
+        //任务备注
+        public string F_TaskRemark { get; set; }
+        //乡镇
+        public string F_City { get; set; }
+        //住址
+        public string F_Address { get; set; }
+    }
 }