根据息县提出问题调整

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

@@ -756,10 +756,15 @@ namespace CallCenterApi.Interface.Controllers.callout
             return Success("获取成功", obj);
         }
         //获取我的任务列表
-        public ActionResult GetMyTaskList(string key, int pagesize = 10, int pageindex = 1)
+        public ActionResult GetMyTaskList(string key, string sdate, string edate, int pagesize = 10, int pageindex = 1)
         {
             StringBuilder sb = new StringBuilder();
             int userid = CurrentUser.UserData.F_UserId;
+            #region 条件查询
+            if (!string.IsNullOrWhiteSpace(sdate))
+                sb.Append(" and DATEDIFF(day,ExpandDatField1,'" + sdate.Trim() + "')<=0");
+            if (!string.IsNullOrWhiteSpace(edate))
+                sb.Append(" and DATEDIFF(day,ExpandDatField1,'" + edate.Trim() + "')>=0");
             sb.Append(" and F_UserId=" + userid);
             sb.Append(" and F_DeleteFlag=0 ");
             //sb.Append(" and isnull(F_HJJGName,'')!='正常接通' and isnull(F_YHFKName,'')!='已同意'");
@@ -776,13 +781,14 @@ namespace CallCenterApi.Interface.Controllers.callout
             //    sqlwhere = " and F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' ";
             //}
             //sb.Append(" and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0 " + sqlwhere + ") ");
+            #endregion
             var recordCount = 0;
             var dt = BLL.PagerBLL.GetListPager(
                     "T_Call_OutTaskTelNum",
                     "F_Id",
                     "*",
                     sb.ToString(),
-                    "ORDER BY F_Id desc",
+                    "ORDER BY ExpandDatField1 asc,F_Id desc",//ExpandDatField1 asc 调查时间正序 id倒序
                     pagesize,
                     pageindex,
                     true,
@@ -796,12 +802,17 @@ namespace CallCenterApi.Interface.Controllers.callout
             return Content(obj.ToJson());
         }
         //获取我的任务结果
-        public ActionResult GetMyResultList(string key, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
+        public ActionResult GetMyResultList(string key, string sdate, string edate, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
         {
             StringBuilder sb = new StringBuilder();
             int userid = CurrentUser.UserData.F_UserId;
+            #region 条件查询
             sb.Append(" and F_UserId=" + userid);
-            sb.Append(" and F_DeleteFlag=0 ");
+            sb.Append(" and F_DeleteFlag=0 ");            
+            if (!string.IsNullOrWhiteSpace(sdate))
+                sb.Append(" and DATEDIFF(day,ExpandDatField1,'" + sdate.Trim() + "')<=0");
+            if (!string.IsNullOrWhiteSpace(edate))
+                sb.Append(" and DATEDIFF(day,ExpandDatField1,'" + edate.Trim() + "')>=0");
             if (hjjgid != 0)
             {
                 sb.Append(" and F_HJJGId=" + hjjgid);
@@ -824,13 +835,14 @@ namespace CallCenterApi.Interface.Controllers.callout
             //    sqlwhere = " and F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' ";
             //}
             //sb.Append(" and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0 " + sqlwhere + ") ");
+            #endregion
             var recordCount = 0;
             var dt = BLL.PagerBLL.GetListPager(
                     "T_Call_OutTaskTelNum",
                     "F_Id",
                     "*",
                     sb.ToString(),
-                    "ORDER BY F_Id desc",
+                    "ORDER BY ExpandDatField1 desc,F_Id desc",//ExpandDatField1 调查时间倒序，id倒序
                     pagesize,
                     pageindex,
                     true,
@@ -856,10 +868,15 @@ namespace CallCenterApi.Interface.Controllers.callout
             return Content(obj.ToJson());
         }
         //获取总体任务结果
-        public ActionResult GetResultList(string key, int userid = 0, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
+        public ActionResult GetResultList(string key, string sdate, string edate, int userid = 0, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
         {
             StringBuilder sb = new StringBuilder();
+            #region 条件查询
             sb.Append(" and F_DeleteFlag=0 ");
+            if (!string.IsNullOrWhiteSpace(sdate))
+                sb.Append(" and DATEDIFF(day,ExpandDatField1,'" + sdate.Trim() + "')<=0");
+            if (!string.IsNullOrWhiteSpace(edate))
+                sb.Append(" and DATEDIFF(day,ExpandDatField1,'" + edate.Trim() + "')>=0");
             if (userid != 0)
             {
                 sb.Append(" and F_UserId=" + userid);
@@ -886,13 +903,14 @@ namespace CallCenterApi.Interface.Controllers.callout
             //    sqlwhere = " and F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' ";
             //}
             //sb.Append(" and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0 " + sqlwhere + ") ");
+            #endregion
             var recordCount = 0;
             var dt = BLL.PagerBLL.GetListPager(
                     "T_Call_OutTaskTelNum",
                     "F_Id",
                     "*",
                     sb.ToString(),
-                    "ORDER BY F_Id desc",
+                    "ORDER BY ExpandDatField1 desc,F_Id desc",//ExpandDatField1 调查时间倒序，id倒序
                     pagesize,
                     pageindex,
                     true,

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

@@ -79,7 +79,7 @@ namespace CallCenterApi.Interface.Controllers.report
                             {
                                 if (num > 0)
                                 {
-                                    dr["bili"] = (num / totalnum * 100).ToString() + "%";
+                                    dr["bili"] = Math.Round(Convert.ToDecimal(Convert.ToDecimal(num) / totalnum * 100), 1).ToString() + "%";
                                 }
                                 else
                                 {
@@ -88,11 +88,18 @@ namespace CallCenterApi.Interface.Controllers.report
                             }
                             else
                             { dr["bili"] = "0"; }
-                            
+
                             dtnew.Rows.Add(dr);
                         }
                     }
-
+                    #region 总计
+                    DataRow drzj = dtnew.NewRow();
+                    drzj["wenti"] = "总计";
+                    drzj["xuanxiang"] = "";
+                    drzj["shuliang"] = totalnum;
+                    drzj["bili"] = "-";
+                    dtnew.Rows.Add(drzj);
+                    #endregion
                 }
             }
             return Success("获取外呼任务报表数据成功", dtnew);