修改当项多时 以pager方式获取数据结果有误的bug

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

@@ -28,7 +28,7 @@ namespace CallCenterApi.Interface.Controllers.report
             //添加第一行标题
             //DataColumn dc1 = new DataColumn("");
             //dtNew.Columns.Add(dc1);
-            var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂')";
+            var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂') and F_DeleteFlag = 0";
             var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
             int dtGDLY1rowcount = dtGDLY1.Rows.Count;
             //列名
@@ -41,7 +41,7 @@ namespace CallCenterApi.Interface.Controllers.report
             for (int v = 0; v < dtGDLY1rowcount; v++)
             {
                 string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
-                var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_DeleteFlag = 0 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
+                var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_DeleteFlag = 0 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
                 dtGDLY1_name[v + 1] = catename;
                 dtGDLY1_count[v + 1] = count_sub;
             }
@@ -99,7 +99,7 @@ namespace CallCenterApi.Interface.Controllers.report
               "*",
               sqlGDLY,
               "ORDER BY F_ParentId asc",
-              10,
+              100,
               1,
               true,
               out recordCount);
@@ -134,31 +134,10 @@ namespace CallCenterApi.Interface.Controllers.report
         {
             DataTable dtNew = new DataTable();
             #region 添加表格标题
-            ////添加第一行标题
-            ////DataColumn dc1 = new DataColumn("");
-            ////dtNew.Columns.Add(dc1);
-            //var sqlGDLY1 = "select F_CategoryId,F_CategoryName from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂'))";
-            //var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
-            //int dtGDLY1rowcount = dtGDLY1.Rows.Count;
-            ////列名
-            //string[] dtGDLY1_name = new string[dtGDLY1rowcount + 1];
-            //dtGDLY1_name[0] = "";
-            ////列数
-            //int[] dtGDLY1_count = new int[dtGDLY1rowcount + 1];
-            //dtGDLY1_count[0] = 1;
-
-            //for (int v = 0; v < dtGDLY1rowcount; v++)
-            //{
-            //    string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
-            //    var count_sub = int.Parse(DbHelperSQL.GetSingle("select count(*) from T_RepositoryCategory where 1=1 and F_CategoryType = 1 and F_ParentId=" + int.Parse(dtGDLY1.Rows[v]["F_CategoryId"].ToString()) + "").ToString());
-            //    dtGDLY1_name[v + 1] = catename;
-            //    dtGDLY1_count[v + 1] = count_sub;
-            //}
-
             //添加第二行标题
             DataColumn dc = new DataColumn("姓名");
             dtNew.Columns.Add(dc);
-            var sqlGDLY = " and F_CategoryType=1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂') and F_DeleteFlag = 0 ) and F_DeleteFlag = 0";
+            var sqlGDLY = " and F_CategoryType=1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_ParentId in (select F_CategoryId from T_RepositoryCategory where F_CategoryType = 1 and F_DeleteFlag = 0 and F_CategoryName = '试剂') and F_DeleteFlag = 0) and F_DeleteFlag = 0";
             var recordCount = 0;
             var dtGDLY = BLL.PagerBLL.GetListPager(
               "T_RepositoryCategory",
@@ -166,7 +145,7 @@ namespace CallCenterApi.Interface.Controllers.report
               "*",
               sqlGDLY,
               "ORDER BY F_ParentId asc",
-              10,
+              100,
               1,
               true,
               out recordCount);
@@ -313,6 +292,8 @@ namespace CallCenterApi.Interface.Controllers.report
                 //colpos[dtcolpos + 2] = 1;
                 //colpos[dtcolpos + 3] = 1;
 
+
+
                 NPOIHelper npoi = new NPOIHelper();
                 DataTable dt = getData(stime, endtime);
                 #region 处理第二行标题
@@ -326,7 +307,7 @@ namespace CallCenterApi.Interface.Controllers.report
                   "*",
                   sqlGDLY,
                   "ORDER BY F_ParentId asc",
-                  10,
+                  100,
                   1,
                   true,
                   out recordCount);
@@ -340,6 +321,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 colnames.Add("");
                 #endregion
+
                 if (npoi.ExportToExcelForGDLX("工单类型试剂报表", dt, "试剂", dtGDLY1_name, colpos, colnames) == "")
                 {
                     var obj = new

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

@@ -102,7 +102,7 @@ namespace CallCenterApi.Interface.Controllers.report
               "*",
               sqlGDLY,
               "ORDER BY F_ParentId asc",
-              10,
+              100,
               1,
               true,
               out recordCount);
@@ -148,7 +148,7 @@ namespace CallCenterApi.Interface.Controllers.report
               "*",
               sqlGDLY,
               "ORDER BY F_ParentId asc",
-              10,
+              100,
               1,
               true,
               out recordCount);
@@ -310,7 +310,7 @@ namespace CallCenterApi.Interface.Controllers.report
                   "*",
                   sqlGDLY,
                   "ORDER BY F_ParentId asc",
-                  10,
+                  100,
                   1,
                   true,
                   out recordCount);