问答题填充到工单备注中

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

@@ -276,7 +276,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                 {
                     paperid = tmodel.F_PagerID.Value;
                     #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 qlist = questionBLL.GetModelList(" F_DeleteFlag=0 and F_QuestionId in (select F_QuestionId from T_Ask_PagerItems where F_PagerId=" + paperid + ") order by F_QuestionId ");
 
                     var newmodel = new
                     {
@@ -286,22 +286,40 @@ namespace CallCenterApi.Interface.Controllers.callout
                         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('；') + "。",
-                         };
-                     })
+                        queslist = qlist.Where(t => t.F_Type == 3).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('；') + "。",
+                            };
+                        }),
+                        textlist = qlist.Where(t => t.F_Type == 1).Select(t => {
+                            //获取问答题以及答案
+                            var answers = "";
+                            var qalist = anslist.Where(al => al.F_QID.Value == t.F_QuestionId).ToList<Model.T_Call_OutAnswers>();
+                            if (qalist.Count > 0)
+                            {
+                                foreach (var item in qalist)
+                                {
+                                    answers += item.F_Answer + "；";
+                                }
+                            }
+                            return new
+                            {
+                                questitle = t.F_Title,
+                                quesanswers = answers.Trim('；') + "。",
+                            };
+                        })
                     };
                     #endregion
 
@@ -321,7 +339,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             {
                 var anslist = answxBLL.GetModelList(" F_CusTelID=" + telid + " ");
 
-                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 qlist = questionBLL.GetModelList(" F_DeleteFlag=0 and F_QuestionId in (select F_QuestionId from T_Ask_PagerItems where F_PagerId="+model.F_PagerId+") order by F_QuestionId ");
 
                 var newmodel = new
                 {
@@ -331,23 +349,42 @@ namespace CallCenterApi.Interface.Controllers.callout
                     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>();
-                    if (qalist.Count > 0)
+                    queslist = qlist.Where(t => t.F_Type == 3).Select(q =>
                     {
-                        foreach (var item in qalist)
+                        ////获取多选题目以及答案
+                        var answers = "";
+                        var qalist = anslist.Where(al => al.F_QID.Value == q.F_QuestionId).ToList<Model.T_Call_OutAnswersWX>();
+                        if (qalist.Count > 0)
                         {
-                            answers += item.F_Answer + "；";
+                            foreach (var item in qalist)
+                            {
+                                answers += item.F_Answer + "；";
+                            }
                         }
-                    }
-                    return new
+                        return new
+                        {
+                            questitle = q.F_Title,
+                            quesanswers = answers.Trim('；') + "。",
+                        };
+                    }),
+                    textlist = qlist.Where(t => t.F_Type == 1).Select(q =>
                     {
-                        questitle = q.F_Title,
-                        quesanswers = answers.Trim('；') + "。",
-                    };
-                })
+                        //获取问答题以及答案
+                        var answers = "";
+                        var qalist = anslist.Where(al => al.F_QID.Value == q.F_QuestionId).ToList<Model.T_Call_OutAnswersWX>();
+                        if (qalist.Count > 0)
+                        {
+                            foreach (var item in qalist)
+                            {
+                                answers += item.F_Answer + "；";
+                            }
+                        }
+                        return new
+                        {
+                            questitle = q.F_Title,
+                            quesanswers = answers.Trim('；') + "。",
+                        };
+                    })
                 };
 
                 return Success("获取多选题及答案成功", newmodel);