Inicio Explorar Ayuda
Registro Iniciar sesión
zhengbingbing
/
Autobio_API
Seguir 1
Destacar 0
Fork 0
Código Incidencias 0 Pull Requests 0 Commits 229 Releases 0 Wiki
Explorar el Código

工单类型仪器和工单类型试剂接口修改

machenyang %!s(int64=8) %!d(string=hace) años
padre
9e401efcb4
commit
e290a941fd
Se han modificado 2 ficheros con 15 adiciones y 15 borrados
Dividir vista Mostrar estadísticas de diff
  1. 7 7
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/GDLXSJController.cs
  2. 8 8
      codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/GDLXYQController.cs

+ 7 - 7
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/GDLXSJController.cs
Ver fichero 

@@ -41,7 +41,7 @@ namespace CallCenterApi.Interface.Controllers.report
41 41 
             for (int v = 0; v < dtGDLY1rowcount; v++)
42 42 
             {
43 43 
                 string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
44 
-                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());
44 
+                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());
45 45 
                 dtGDLY1_name[v + 1] = catename;
46 46 
                 dtGDLY1_count[v + 1] = count_sub;
47 47 
             }
 
@@ -65,7 +65,7 @@ namespace CallCenterApi.Interface.Controllers.report
65 65 
             //添加第一行标题
66 66 
             //DataColumn dc1 = new DataColumn("");
67 67 
             //dtNew.Columns.Add(dc1);
68 
-            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 = '试剂')";
68 
+            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";
69 69 
             var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
70 70 
             int dtGDLY1rowcount = dtGDLY1.Rows.Count;
71 71 
             //列名
 
@@ -78,7 +78,7 @@ namespace CallCenterApi.Interface.Controllers.report
78 78 
             for (int v = 0; v < dtGDLY1rowcount; v++)
79 79 
             {
80 80 
                 string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
81 
-                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());
81 
+                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());
82 82 
                 dtGDLY1_name[v + 1] = catename;
83 83 
                 dtGDLY1_count[v + 1] = count_sub;
84 84 
             }
 
@@ -91,7 +91,7 @@ namespace CallCenterApi.Interface.Controllers.report
91 91 
             //dtNew.Columns.Add(dc);
92 92 
             List<string> colnames = new List<string>();
93 93 
             colnames.Add("姓名");
94 
-            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 = '试剂'))";
94 
+            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";
95 95 
             var recordCount = 0;
96 96 
             var dtGDLY = BLL.PagerBLL.GetListPager(
97 97 
               "T_RepositoryCategory",
 
@@ -158,7 +158,7 @@ namespace CallCenterApi.Interface.Controllers.report
158 158 
             //添加第二行标题
159 159 
             DataColumn dc = new DataColumn("姓名");
160 160 
             dtNew.Columns.Add(dc);
161 
-            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 = '试剂'))";
161 
+            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";
162 162 
             var recordCount = 0;
163 163 
             var dtGDLY = BLL.PagerBLL.GetListPager(
164 164 
               "T_RepositoryCategory",
 
@@ -252,7 +252,7 @@ namespace CallCenterApi.Interface.Controllers.report
252 252 
                 //添加第一行标题
253 253 
                 //DataColumn dc1 = new DataColumn("");
254 254 
                 //dtNew.Columns.Add(dc1);
255 
-                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 = '试剂')";
255 
+                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";
256 256 
                 var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
257 257 
                 int dtGDLY1rowcount = dtGDLY1.Rows.Count;
258 258 
                 //每块占的列数
 
@@ -268,7 +268,7 @@ namespace CallCenterApi.Interface.Controllers.report
268 268 
                 for (int v = 0; v < dtGDLY1rowcount; v++)
269 269 
                 {
270 270 
                     string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
271 
-                    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());
271 
+                    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());
272 272 
                     dtGDLY1_name[v + 1] = catename;
273 273 
                     dtGDLY1_count[v + 1] = count_sub;
274 274 
                     colpos[v + 1] = count_sub;

+ 8 - 8
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/GDLXYQController.cs
Ver fichero 

@@ -31,7 +31,7 @@ namespace CallCenterApi.Interface.Controllers.report
31 31 
             //添加第一行标题
32 32 
             //DataColumn dc1 = new DataColumn("");
33 33 
             //dtNew.Columns.Add(dc1);
34 
-            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 = '仪器')";
34 
+            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";
35 35 
             var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
36 36 
             int dtGDLY1rowcount = dtGDLY1.Rows.Count;
37 37 
             //列名
 
@@ -44,7 +44,7 @@ namespace CallCenterApi.Interface.Controllers.report
44 44 
             for (int v = 0; v < dtGDLY1rowcount; v++)
45 45 
             {
46 46 
                 string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
47 
-                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());
47 
+                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());
48 48 
                 dtGDLY1_name[v + 1] = catename;
49 49 
                 dtGDLY1_count[v + 1] = count_sub;
50 50 
             }
 
@@ -68,7 +68,7 @@ namespace CallCenterApi.Interface.Controllers.report
68 68 
             //添加第一行标题
69 69 
             //DataColumn dc1 = new DataColumn("");
70 70 
             //dtNew.Columns.Add(dc1);
71 
-            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 = '仪器')";
71 
+            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";
72 72 
             var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
73 73 
             int dtGDLY1rowcount = dtGDLY1.Rows.Count;
74 74 
             //列名
 
@@ -81,7 +81,7 @@ namespace CallCenterApi.Interface.Controllers.report
81 81 
             for (int v = 0; v < dtGDLY1rowcount; v++)
82 82 
             {
83 83 
                 string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
84 
-                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());
84 
+                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());
85 85 
                 dtGDLY1_name[v + 1] = catename;
86 86 
                 dtGDLY1_count[v + 1] = count_sub;
87 87 
             }
 
@@ -94,7 +94,7 @@ namespace CallCenterApi.Interface.Controllers.report
94 94 
             //dtNew.Columns.Add(dc);
95 95 
             List<string> colnames = new List<string>();
96 96 
             colnames.Add("姓名");
97 
-            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 = '仪器'))";
97 
+            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";
98 98 
             var recordCount = 0;
99 99 
             var dtGDLY = BLL.PagerBLL.GetListPager(
100 100 
               "T_RepositoryCategory",
 
@@ -161,7 +161,7 @@ namespace CallCenterApi.Interface.Controllers.report
161 161 
             //添加第二行标题
162 162 
             DataColumn dc = new DataColumn("姓名");
163 163 
             dtNew.Columns.Add(dc);
164 
-            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 = '仪器'))";
164 
+            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";
165 165 
             var recordCount = 0;
166 166 
             var dtGDLY = BLL.PagerBLL.GetListPager(
167 167 
               "T_RepositoryCategory",
 
@@ -255,7 +255,7 @@ namespace CallCenterApi.Interface.Controllers.report
255 255 
                 //添加第一行标题
256 256 
                 //DataColumn dc1 = new DataColumn("");
257 257 
                 //dtNew.Columns.Add(dc1);
258 
-                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 = '仪器')";
258 
+                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";
259 259 
                 var dtGDLY1 = DbHelperSQL.Query(sqlGDLY1).Tables[0];
260 260 
                 int dtGDLY1rowcount = dtGDLY1.Rows.Count;
261 261 
                 //每块占的列数
 
@@ -271,7 +271,7 @@ namespace CallCenterApi.Interface.Controllers.report
271 271 
                 for (int v = 0; v < dtGDLY1rowcount; v++)
272 272 
                 {
273 273 
                     string catename = dtGDLY1.Rows[v]["F_CategoryName"].ToString();
274 
-                    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());
274 
+                    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());
275 275 
                     dtGDLY1_name[v + 1] = catename;
276 276 
                     dtGDLY1_count[v + 1] = count_sub;
277 277 
                     colpos[v + 1] = count_sub;