Merge branch 'master' of http://192.168.1.222:3000/duhongyu/GongYi_API

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

@@ -9,6 +9,7 @@ using CallCenterApi.Model;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
 using System.Web;
@@ -2752,7 +2753,7 @@ namespace CallCenterApi.Interface.Controllers.report
             paras.Add("@sdate", start.Value.ToString("yyyy-MM-dd"));
             paras.Add("@edate", end.Value.ToString("yyyy-MM-dd"));
             paras.Add("@deptid", dept);
-            var obj = DbHelperSQL.RunProcedure("P_PerformanceAssessment0317", paras, "PerformanceAssessment");
+            var obj = DbHelperSQL.RunProcedure("P_PerformanceAssessment", paras, "PerformanceAssessment");
             if (isExport)
             {
                 string[] cols = new string[] { "单位名称","办件数量", "工单实时签收率", "实时退单率", "重复退单率", "按时办结率", "办结提速率","扫描件上传速率", "结果满意率",
@@ -2778,7 +2779,7 @@ namespace CallCenterApi.Interface.Controllers.report
         /// <param name="start"></param>
         /// <param name="end"></param>
         /// <returns></returns>
-        public ActionResult GetPerformanceAssessmentList(DateTime? start, DateTime? end, int deptid = 0,int tmptype=1)
+        public ActionResult GetPerformanceAssessmentList(DateTime? start, DateTime? end, int deptid = 0,int tmptype=1,int pagesize=20,int pageindex=1)
         {
             StringBuilder sb1 = new StringBuilder();
             StringBuilder sb2 = new StringBuilder();
@@ -2796,22 +2797,34 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 dept = deptid + "";
             }
-            Dictionary<string, string> paras = new Dictionary<string, string>();
-            paras.Add("@sdate", start.Value.ToString("yyyy-MM-dd"));
-            paras.Add("@edate", end.Value.ToString("yyyy-MM-dd"));
-            paras.Add("@deptid", dept);
-            var obj = DbHelperSQL.RunProcedure("P_PerformanceAssessment0317", paras, "PerformanceAssessment").Tables[1];
-            DataTable dbobj = obj.Clone();
-            dbobj.Clear();
-            foreach (DataRow row in obj.Rows)
-            {
-                if (Convert.ToInt32(row["tmptype"]) == tmptype)
-                {
-                    dbobj.Rows.Add(row.ItemArray);
-                   
-                }
-            }
-            return Success("成功", dbobj); 
+          SqlParameter[] Paras =
+          {
+                new SqlParameter("@sdate",SqlDbType.VarChar,20),
+                new SqlParameter("@edate",SqlDbType.VarChar,20),
+                new SqlParameter("@deptid",SqlDbType.VarChar,20),
+                new SqlParameter("@tmptype",SqlDbType.Int),
+                new SqlParameter("@pagesize",SqlDbType.Int),
+                new SqlParameter("@pageindex",SqlDbType.Int),
+
+            };
+            Paras[0].Value = start;
+            Paras[1].Value = end;
+            Paras[2].Value = deptid;
+            Paras[3].Value = tmptype;
+            Paras[4].Value = pagesize;
+            Paras[5].Value = pageindex;           
+            var obj = DbHelperSQL.RunProcedure("P_PerformanceAssessment0317", Paras, "PerformanceAssessment").Tables[0];
+            //DataTable dbobj = obj.Clone();
+            //dbobj.Clear();
+            //foreach (DataRow row in obj.Rows)
+            //{
+            //    if (Convert.ToInt32(row["tmptype"]) == tmptype)
+            //    {
+            //        dbobj.Rows.Add(row.ItemArray);
+
+            //    }
+            //}
+            return Success("成功", obj);
         }
 
         /// <summary>