新增报表，修改外呼回答bug

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

@@ -738,7 +738,8 @@ namespace CallCenterApi.Interface.Controllers.callout
             sb.Append(" and F_UserId=" + userid);
             sb.Append(" and F_DeleteFlag=0 ");
             //sb.Append(" and isnull(F_HJJGName,'')!='正常接通' and isnull(F_YHFKName,'')!='已同意'");
-            sb.Append(" and isnull(F_HJJGName,'')=''");
+            //sb.Append(" and isnull(F_HJJGName,'')=''");
+            sb.Append(" and isnull(F_HJJGName,'')!='正常接通' and isnull(F_HJJGName,'')!='免回访'");
             sb.Append(" and F_Taskid in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0)");
             if (!string.IsNullOrWhiteSpace(key))
             {
@@ -1111,6 +1112,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                 }
                 else
                 {
+                    cusmodel = new Model.T_Cus_CustomerBase();
                     cusmodel.F_Address = address;
                     if (fkconfig != null)
                         cusmodel.F_City = fkconfig.F_Name;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/CallOutReportController.cs

@@ -16,8 +16,17 @@ namespace CallCenterApi.Interface.Controllers.report
         private readonly BLL.T_Call_OutAnswers ansBLL = new BLL.T_Call_OutAnswers();
         private readonly BLL.T_Ask_QuestionItems questionItemBLL = new BLL.T_Ask_QuestionItems();
 
-        #region 问卷调查报告数据简单查询
-        public ActionResult GetReport(string TaskName,int quesid,int countryid)
+        #region 获取外呼任务报表查询
+        /// <summary>
+        /// 外呼任务报表
+        /// </summary>
+        /// <param name="TaskID">任务id</param>
+        /// <param name="quesid">问题id</param>
+        /// <param name="countryid">乡镇id</param>
+        /// <param name="sdate">开始时间</param>
+        /// <param name="edate">结束时间</param>
+        /// <returns></returns>
+        public ActionResult GetReport(string TaskID, int quesid,int countryid,string sdate,string edate)
         {
             #region 新建输出表
             DataTable dtnew = new DataTable();
@@ -26,20 +35,21 @@ namespace CallCenterApi.Interface.Controllers.report
             dtnew.Columns.Add("shuliang");
             dtnew.Columns.Add("bili");
             #endregion
-            #region 根据任务名获取任务ID
-            //根据任务名获取任务ID
-            string TaskID = "";
-            var objo = DbHelperSQL.GetSingle("select F_TaskID from T_Call_OutTask where F_TaskName='" + TaskName + "'");
-            if (objo != null)
-            {
-                TaskID = objo.ToString();
-            }
-            #endregion
+
             #region 根据问题id获取问题的查询条件
-            string sqlques = "F_QuestionId IN (select ta.F_QuestionId from  T_Ask_PagerItems ta where ta.F_PagerId=(select F_PagerID from T_Call_OutTask where F_TaskID='" + TaskID + "') ) and F_Type!=1";
+            string sqlques = "F_QuestionId IN (select ta.F_QuestionId from  T_Ask_PagerItems ta where ta.F_PagerId=(select F_PagerID from T_Call_OutTask where isnull(F_TaskID,'')='" + TaskID + "') ) and F_Type!=1";
             if (quesid > 0)
                 sqlques = "F_QuestionId="+ quesid;
             #endregion
+            #region 回答问题查询条件
+            string sqlans = " isnull(F_TaskID,'')='" + TaskID + "' ";
+            if (countryid > 0)
+                sqlans += " and isnull(F_Expand1,'')='" + countryid + "' ";
+            if (!string.IsNullOrWhiteSpace(sdate))
+                sqlans += "DATEDIFF(day,F_OptOn,'"+ sdate.Trim() + "')<=0";
+            if (!string.IsNullOrWhiteSpace(edate))
+                sqlans += "DATEDIFF(day,F_OptOn,'" + edate.Trim() + "')>=0";
+            #endregion
             var queslist = questionBLL.GetModelList(sqlques);
 
             if (queslist.Count > 0)
@@ -48,9 +58,10 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     string content = itemques.F_Content;
                     string question = itemques.F_Title;
-                    string[] item = content.Split(';');
+
+                    sqlans += " and isnull(F_QID,'')='" + itemques.F_QuestionId + "' ";
                     //根据问题ID获取当前问题各选项答案总数
-                    int totalnum = ansBLL.GetRecordCount(" isnull(F_TaskID,'')='" + TaskID + "'  and isnull(F_QID,'')='" + itemques.F_QuestionId + "' ");
+                    int totalnum = ansBLL.GetRecordCount(sqlans);
 
                     //根据问题ID查询问题项
                     var dsi = questionItemBLL.GetModelList(" isnull(F_QuestionId,'') = '" + itemques.F_QuestionId + "' ");
@@ -61,7 +72,7 @@ namespace CallCenterApi.Interface.Controllers.report
                             DataRow dr = dtnew.NewRow();
                             dr["wenti"] = question;
                             dr["xuanxiang"] = itemqi.F_ItemName;
-                            int num = ansBLL.GetRecordCount(" isnull(F_TaskID,'')='" + TaskID + "'  and isnull(F_Answer,'')='" + itemqi.F_ItemName + "' and isnull(F_QID,'')='" + itemques.F_QuestionId + "' and isnull(F_Expand1,'')='" + countryid + "'");
+                            int num = ansBLL.GetRecordCount(sqlans + "  and isnull(F_QIID,'')='" + itemqi.F_ItemId + "' ");
                             dr["shuliang"] = num;
                             if (totalnum != 0)
                             {
@@ -83,12 +94,12 @@ namespace CallCenterApi.Interface.Controllers.report
 
                 }
             }
-            return Success("获取调查报表数据成功", dtnew);
+            return Success("获取外呼任务报表数据成功", dtnew);
             
         }
         #endregion
 
-        #region  数据查询--获取乡镇统计排名
+        #region  获取乡镇统计排名
         public ActionResult GetRank(string startdate, string enddate)
         {
             if (string.IsNullOrWhiteSpace(startdate))