Parcourir la Source

Merge commit '07ad2222a987475a7b918b0ff747904c7e4c90d9'

zhaozhiqiang il y a 3 ans
Parent
commit
b3c281f0e6

+ 12 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

2835
             Paras[4].Value = pagesize;
2835
             Paras[4].Value = pagesize;
2836
             Paras[5].Value = pageindex;
2836
             Paras[5].Value = pageindex;
2837
             Paras[6].Value = IsScore;
2837
             Paras[6].Value = IsScore;
2838
-            var obj = DbHelperSQL.RunProcedure("P_PerformanceAssessment0317", Paras, "PerformanceAssessment").Tables[0];
2838
+            //var obj = DbHelperSQL.RunProcedure("P_PerformanceAssessment0317", Paras, "PerformanceAssessment").Tables[0];
2839
             //DataTable dbobj = obj.Clone();
2839
             //DataTable dbobj = obj.Clone();
2840
             //dbobj.Clear();
2840
             //dbobj.Clear();
2841
             //foreach (DataRow row in obj.Rows)
2841
             //foreach (DataRow row in obj.Rows)
2846
 
2846
 
2847
             //    }
2847
             //    }
2848
             //}
2848
             //}
2849
-            return Success("成功", obj);
2849
+            var HelperSQL = DbHelperSQL.RunProcedure("P_PerformanceAssessment0317", Paras, "PerformanceAssessment");
2850
+            var obj = new
2851
+            {
2852
+                state = "success",
2853
+                message = "成功",
2854
+                data = HelperSQL.Tables[0],
2855
+                total = int.Parse(HelperSQL.Tables[1].Rows[0]["total"].ToString())
2856
+            };
2857
+
2858
+            return Content(obj.ToJson());
2859
+
2850
         }
2860
         }
2851
 
2861
 
2852
 
2862