调整问卷获取

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

@@ -1057,6 +1057,11 @@ namespace CallCenterApi.Interface.Controllers.callout
                     //var fkconfig = new BLL.T_Sys_DictionaryValue().GetModel(yhfkid);
                     //if (fkconfig != null)
                     //    otnModel.F_YHFKName = fkconfig.F_Name;
+                    otnModel.ExpandVchField2 = phone;
+                    otnModel.ExpandVchField3 = address;
+                    var fkconfig = new BLL.T_Sys_DictionaryValue().GetModel(countryid);
+                    if (fkconfig != null)
+                        otnModel.ExpandVchField4 = fkconfig.F_Name;
                     otnModel.ExpandIntField1 = countryid;//乡镇
                     otnModel.ExpandDatField1 = DateTime.Now;//调查时间
                     otnModel.F_AskRes = askqids;

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

@@ -278,23 +278,31 @@ namespace CallCenterApi.Interface.Controllers.callout
                     #region 获取多选题目以及答案
                     var qlist = questionBLL.GetModelList(" F_DeleteFlag=0 and F_QuestionId in (select F_QuestionId from T_Ask_PagerItems where F_PagerId=" + paperid + ") and F_Type=3 order by F_QuestionId ");
 
-                    var newmodel = qlist.Select(q =>
+                    var newmodel = new
                     {
-                        var answers = "";
-                        var qalist = anslist.Where(al => al.F_QID.Value == q.F_QuestionId).ToList<Model.T_Call_OutAnswers>();
-                        if (qalist.Count > 0)
-                        {
-                            foreach (var item in qalist)
-                            {
-                                answers += item.F_Answer + "；";
-                            }
-                        }
-                        return new
-                        {
-                            questitle = q.F_Title,
-                            quesanswers = answers.Trim('；') + "。",
-                        };
-                    });
+                        cusname = model.F_CusName,
+                        telphone = model.F_Phone,
+                        cusphone = model.ExpandVchField2,
+                        countryid = model.ExpandIntField1,
+                        country = model.ExpandVchField4,
+                        address = model.ExpandVchField3,
+                        queslist = qlist.Select(q =>{
+                         var answers = "";
+                         var qalist = anslist.Where(al => al.F_QID.Value == q.F_QuestionId).ToList<Model.T_Call_OutAnswers>();
+                         if (qalist.Count > 0)
+                         {
+                             foreach (var item in qalist)
+                             {
+                                 answers += item.F_Answer + "；";
+                             }
+                         }
+                         return new
+                         {
+                             questitle = q.F_Title,
+                             quesanswers = answers.Trim('；') + "。",
+                         };
+                     })
+                    };
                     #endregion
 
                     return Success("获取多选题及答案成功", newmodel);
@@ -315,7 +323,15 @@ namespace CallCenterApi.Interface.Controllers.callout
 
                 var qlist = questionBLL.GetModelList(" F_DeleteFlag=0 and F_QuestionId in (select F_QuestionId from T_Ask_PagerItems where F_PagerId="+model.F_PagerId+") and F_Type=3 order by F_QuestionId ");
 
-                var newmodel = qlist.Select(q =>
+                var newmodel = new
+                {
+                    cusname = model.F_UserName,
+                    telphone = model.F_TelPhone,
+                    cusphone = model.F_Phone,
+                    countryid = model.F_CountryId,
+                    country = model.F_Country,
+                    address = model.F_Address,
+                    queslist = qlist.Select(q =>
                 {
                     var answers = "";
                     var qalist = anslist.Where(al => al.F_QID.Value == q.F_QuestionId).ToList<Model.T_Call_OutAnswersWX>();
@@ -331,7 +347,8 @@ namespace CallCenterApi.Interface.Controllers.callout
                         questitle = q.F_Title,
                         quesanswers = answers.Trim('；') + "。",
                     };
-                });
+                })
+                };
 
                 return Success("获取多选题及答案成功", newmodel);
             }