调整外呼报表，增加行政村参数

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

@@ -27,7 +27,7 @@ namespace CallCenterApi.Interface.Controllers.report
         /// <param name="sdate">开始时间</param>
         /// <param name="edate">结束时间</param>
         /// <returns></returns>
-        public ActionResult GetReport(string TaskID, string quesid, string countryid, string sdate, string edate)
+        public ActionResult GetReport(string TaskID, string quesid, string countryid,string villageid, string sdate, string edate)
         {
             #region 新建输出表
             DataTable dtnew = new DataTable();
@@ -46,6 +46,8 @@ namespace CallCenterApi.Interface.Controllers.report
             string sqlans = " isnull(F_TaskID,'')='" + TaskID + "' ";
             if (!string.IsNullOrWhiteSpace(countryid))
                 sqlans += " and isnull(F_Expand1,'')='" + countryid + "' ";
+            if (!string.IsNullOrWhiteSpace(villageid))
+                sqlans += " and isnull(F_Expand2,'')='" + villageid + "' ";
             if (!string.IsNullOrWhiteSpace(sdate))
                 sqlans += " and DATEDIFF(day,F_OptOn,'"+ sdate.Trim() + "')<=0";
             if (!string.IsNullOrWhiteSpace(edate))
@@ -100,7 +102,7 @@ namespace CallCenterApi.Interface.Controllers.report
         }
 
         #region 外呼任务报表导出Excel
-        public ActionResult GetReportExpt(string TaskID, string quesid, string countryid, string sdate, string edate)
+        public ActionResult GetReportExpt(string TaskID, string quesid, string countryid, string villageid, string sdate, string edate)
         {
             #region 新建输出表
             DataTable dtnew = new DataTable();
@@ -119,6 +121,8 @@ namespace CallCenterApi.Interface.Controllers.report
             string sqlans = " isnull(F_TaskID,'')='" + TaskID + "' ";
             if (!string.IsNullOrWhiteSpace(countryid))
                 sqlans += " and isnull(F_Expand1,'')='" + countryid + "' ";
+            if (!string.IsNullOrWhiteSpace(villageid))
+                sqlans += " and isnull(F_Expand2,'')='" + villageid + "' ";
             if (!string.IsNullOrWhiteSpace(sdate))
                 sqlans += " and DATEDIFF(day,F_OptOn,'" + sdate.Trim() + "')<=0";
             if (!string.IsNullOrWhiteSpace(edate))