From 21141fd4e8a1b3445a500733a1aeb880d5be748f Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 08 十月 2021 11:20:58 +0800
Subject: [PATCH] 产品管理导出优化

---
 web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache |    0 
 web/web/Bin/Dao.dll                                            |    0 
 web/web/ExportDocument.aspx.cs                                 |    2 +-
 web/Dao/obj/Debug/Dao.pdb                                      |    0 
 web/Lib/Dao.dll                                                |    0 
 web/Dao/obj/Debug/Dao.dll                                      |    0 
 web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache           |    0 
 web/web/logs/logx.txt                                          |    8 ++++++++
 web/.vs/Web/v16/.suo                                           |    0 
 web/web/logs/err.txt                                           |    8 ++++++++
 web/Dao/GwProductDao.cs                                        |   34 ++++++++++++++++++++++++++++++++--
 web/Lib/Dao.pdb                                                |    0 
 web/web/Bin/Dao.pdb                                            |    0 
 13 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index 12a2cde..6c8b9b9 100644
--- a/web/.vs/Web/v16/.suo
+++ b/web/.vs/Web/v16/.suo
Binary files differ
diff --git a/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache b/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
index df89c73..7a6c2f3 100644
--- a/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
+++ b/web/App_Code/obj/Debug/App_Code.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Dao/GwProductDao.cs b/web/Dao/GwProductDao.cs
index 3494133..86abaea 100644
--- a/web/Dao/GwProductDao.cs
+++ b/web/Dao/GwProductDao.cs
@@ -249,7 +249,37 @@
         {
 
             StringBuilder stringBuilder = new StringBuilder();
-            stringBuilder.Append("select ID, NAME, ICON, INSTRUCTIONS, CLASSES, PARENT_ID, PATH, IS_DEFAULT, IS_ENABLE, SORT, OP_GROUP_ID, API_SP_XH_ID, GIVING_NUM, REMARK from GW_PRODUCT where 1=1");
+            //stringBuilder.Append("select ID, NAME, ICON, INSTRUCTIONS, CLASSES, PARENT_ID, PATH, IS_DEFAULT, IS_ENABLE, SORT, OP_GROUP_ID, API_SP_XH_ID, GIVING_NUM, REMARK from GW_PRODUCT where 1=1");
+            
+            stringBuilder.Append(" select * from ( ");
+            stringBuilder.Append(" select ID, NAME, ICON, INSTRUCTIONS,  ");
+            stringBuilder.Append(" case CLASSES when 0 then '0-浜у搧鍒嗙被' ");
+            stringBuilder.Append(" else '1-浜у搧' ");
+            stringBuilder.Append(" END AS ");
+            stringBuilder.Append(" CLASSES,  ");
+            stringBuilder.Append(" type_id||'-'||type_name PARENT_ID, ");
+            stringBuilder.Append(" PATH,  ");
+            stringBuilder.Append(" case IS_DEFAULT when 0 then '0-鍚�' ");
+            stringBuilder.Append(" else '1-榛樿' ");
+            stringBuilder.Append(" END AS ");
+            stringBuilder.Append(" IS_DEFAULT,  ");
+            stringBuilder.Append(" case IS_ENABLE when 0 then '0-宸插仠鐢�' ");
+            stringBuilder.Append(" else '1-宸插惎鐢�' ");
+            stringBuilder.Append(" END AS ");
+            stringBuilder.Append(" IS_ENABLE,  ");
+            stringBuilder.Append(" SORT,  ");
+            stringBuilder.Append(" (select group_id||'-'||group_name from gw_op_group where group_id=OP_GROUP_ID ) ");
+            stringBuilder.Append(" OP_GROUP_ID,  ");
+            stringBuilder.Append(" (select xh_id||'-'||xh_name from sys_xh where xh_id=API_SP_XH_ID ) ");
+            stringBuilder.Append(" API_SP_XH_ID,  ");
+            stringBuilder.Append(" GIVING_NUM, REMARK  ");
+            stringBuilder.Append(" from GW_PRODUCT a ");
+            stringBuilder.Append(" left join (select id type_id, name type_name from gw_product where classes=0) b ");
+            stringBuilder.Append(" on a.PARENT_ID = b.type_id ");
+            stringBuilder.Append(" ) aa ");
+            stringBuilder.Append(" where 1=1 ");
+            
+
             OracleParameter[] oracleParameterArray = new OracleParameter[3];
             if (name != null && name != "")
             {
@@ -271,7 +301,7 @@
             }
             if (op_group_id != null && op_group_id != "")
             {
-                oracleParameterArray[2] = new OracleParameter(":op_group_id", (OracleDbType)126);
+                oracleParameterArray[2] = new OracleParameter(":op_group_id", (OracleDbType)112);
                 ((DbParameter)oracleParameterArray[2]).Value = (object)op_group_id;
                 stringBuilder.Append(" and op_group_id=:op_group_id");
             }
diff --git a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
index 21c1065..f5e894a 100644
--- a/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.dll b/web/Dao/obj/Debug/Dao.dll
index aee093f..53f3357 100644
--- a/web/Dao/obj/Debug/Dao.dll
+++ b/web/Dao/obj/Debug/Dao.dll
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.pdb b/web/Dao/obj/Debug/Dao.pdb
index 7848570..a2a75ce 100644
--- a/web/Dao/obj/Debug/Dao.pdb
+++ b/web/Dao/obj/Debug/Dao.pdb
Binary files differ
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index aee093f..53f3357 100644
--- a/web/Lib/Dao.dll
+++ b/web/Lib/Dao.dll
Binary files differ
diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb
index 7848570..a2a75ce 100644
--- a/web/Lib/Dao.pdb
+++ b/web/Lib/Dao.pdb
Binary files differ
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index aee093f..53f3357 100644
--- a/web/web/Bin/Dao.dll
+++ b/web/web/Bin/Dao.dll
Binary files differ
diff --git a/web/web/Bin/Dao.pdb b/web/web/Bin/Dao.pdb
index 7848570..a2a75ce 100644
--- a/web/web/Bin/Dao.pdb
+++ b/web/web/Bin/Dao.pdb
Binary files differ
diff --git a/web/web/ExportDocument.aspx.cs b/web/web/ExportDocument.aspx.cs
index 7ce3bc4..e89de75 100644
--- a/web/web/ExportDocument.aspx.cs
+++ b/web/web/ExportDocument.aspx.cs
@@ -343,7 +343,7 @@
         string name = this.AppContext.GetString("name");
         string classes = this.AppContext.GetString("classes");
         string is_default = this.AppContext.GetString("is_default");
-        string op_group_id = this.AppContext.GetString("op_group_id");
+        string op_group_id = this.AppContext.GetString("op_group_id") == "0" ? "" : this.AppContext.GetString("op_group_id");
         using (GwProductDao gwProductDao = new GwProductDao())
         {
             DataTable dataTable = gwProductDao.LoadGwProductDataTable(name, classes, is_default, op_group_id);
diff --git a/web/web/logs/err.txt b/web/web/logs/err.txt
index c6d2578..db3b144 100644
--- a/web/web/logs/err.txt
+++ b/web/web/logs/err.txt
@@ -672,3 +672,11 @@
 进程 ID: 17820
 会话 ID: 14 序列号: 14066
 
+#77  2021-09-30 18:49:30,410 Common.dll OracleHelper.Execute                    SQL=select * from (select rownum r,t.* from ( select ID, NAME, ICON, INSTRUCTIONS,   case CLASSES when 0 then '0-产品分类'  else '1-产品'  END AS  CLASSES,   type_id||type_name PARENT_ID,  PATH,   case IS_DEFAULT when 0 then '0-否'  else '1-默认'  END AS  IS_DEFAULT,   case IS_ENABLE when 0 then '0-已停用'  else '1-已启用'  END AS  IS_ENABLE,   SORT,   (select group_id||'-'||group_name from gw_op_group where group_id=OP_GROUP_ID )  OP_GROUP_ID,   (select xh_id||'-'||xh_name from sys_xh where xh_id=API_SP_XH_ID )  API_SP_XH_ID,   GIVING_NUM, REMARK   from GW_PRODUCT a  left join (select id type_id, name type_name from gw_product where classes=0) b  on a.PARENT_ID = b.type_id  where 1=1  and classes=:classes and is_default=:is_default and op_group_id=:op_group_id) t where rownum <= 100000) Message=ORA-01008: 并非所有变量都已绑定
+
+#84  2021-09-30 18:55:57,819 Common.dll OracleHelper.Execute                    SQL=select * from (select rownum r,t.* from ( select * from (  select ID, NAME, ICON, INSTRUCTIONS,   case CLASSES when 0 then '0-产品分类'  else '1-产品'  END AS  CLASSES,   type_id||type_name PARENT_ID,  PATH,   case IS_DEFAULT when 0 then '0-否'  else '1-默认'  END AS  IS_DEFAULT,   case IS_ENABLE when 0 then '0-已停用'  else '1-已启用'  END AS  IS_ENABLE,   SORT,   (select group_id||'-'||group_name from gw_op_group where group_id=OP_GROUP_ID )  OP_GROUP_ID,   (select xh_id||'-'||xh_name from sys_xh where xh_id=API_SP_XH_ID )  API_SP_XH_ID,   GIVING_NUM, REMARK   from GW_PRODUCT a  left join (select id type_id, name type_name from gw_product where classes=0) b  on a.PARENT_ID = b.type_id  ) aa  where 1=1  and is_default=:is_default and op_group_id=:op_group_id) t where rownum <= 100000) Message=ORA-01722: 无效数字
+
+#84  2021-09-30 19:02:28,348 Common.dll OracleHelper.Execute                    SQL=select * from (select rownum r,t.* from (select ID, NAME, ICON, INSTRUCTIONS, CLASSES, PARENT_ID, PATH, IS_DEFAULT, IS_ENABLE, SORT, OP_GROUP_ID, API_SP_XH_ID, GIVING_NUM, REMARK from GW_PRODUCT where 1=1 and classes=:classes and is_default=:is_default and op_group_id=:op_group_id) t where rownum <= 100000) Message=ORA-01008: 并非所有变量都已绑定
+
+#79  2021-09-30 19:10:34,730 Common.dll OracleHelper.Execute                    SQL=select * from (select rownum r,t.* from (select ID, NAME, ICON, INSTRUCTIONS, CLASSES, PARENT_ID, PATH, IS_DEFAULT, IS_ENABLE, SORT, OP_GROUP_ID, API_SP_XH_ID, GIVING_NUM, REMARK from GW_PRODUCT where 1=1 and classes=:classes and is_default=:is_default) t where rownum <= 100000) Message=ORA-01008: 并非所有变量都已绑定
+
diff --git a/web/web/logs/logx.txt b/web/web/logs/logx.txt
index c6d2578..db3b144 100644
--- a/web/web/logs/logx.txt
+++ b/web/web/logs/logx.txt
@@ -672,3 +672,11 @@
 进程 ID: 17820
 会话 ID: 14 序列号: 14066
 
+#77  2021-09-30 18:49:30,410 Common.dll OracleHelper.Execute                    SQL=select * from (select rownum r,t.* from ( select ID, NAME, ICON, INSTRUCTIONS,   case CLASSES when 0 then '0-产品分类'  else '1-产品'  END AS  CLASSES,   type_id||type_name PARENT_ID,  PATH,   case IS_DEFAULT when 0 then '0-否'  else '1-默认'  END AS  IS_DEFAULT,   case IS_ENABLE when 0 then '0-已停用'  else '1-已启用'  END AS  IS_ENABLE,   SORT,   (select group_id||'-'||group_name from gw_op_group where group_id=OP_GROUP_ID )  OP_GROUP_ID,   (select xh_id||'-'||xh_name from sys_xh where xh_id=API_SP_XH_ID )  API_SP_XH_ID,   GIVING_NUM, REMARK   from GW_PRODUCT a  left join (select id type_id, name type_name from gw_product where classes=0) b  on a.PARENT_ID = b.type_id  where 1=1  and classes=:classes and is_default=:is_default and op_group_id=:op_group_id) t where rownum <= 100000) Message=ORA-01008: 并非所有变量都已绑定
+
+#84  2021-09-30 18:55:57,819 Common.dll OracleHelper.Execute                    SQL=select * from (select rownum r,t.* from ( select * from (  select ID, NAME, ICON, INSTRUCTIONS,   case CLASSES when 0 then '0-产品分类'  else '1-产品'  END AS  CLASSES,   type_id||type_name PARENT_ID,  PATH,   case IS_DEFAULT when 0 then '0-否'  else '1-默认'  END AS  IS_DEFAULT,   case IS_ENABLE when 0 then '0-已停用'  else '1-已启用'  END AS  IS_ENABLE,   SORT,   (select group_id||'-'||group_name from gw_op_group where group_id=OP_GROUP_ID )  OP_GROUP_ID,   (select xh_id||'-'||xh_name from sys_xh where xh_id=API_SP_XH_ID )  API_SP_XH_ID,   GIVING_NUM, REMARK   from GW_PRODUCT a  left join (select id type_id, name type_name from gw_product where classes=0) b  on a.PARENT_ID = b.type_id  ) aa  where 1=1  and is_default=:is_default and op_group_id=:op_group_id) t where rownum <= 100000) Message=ORA-01722: 无效数字
+
+#84  2021-09-30 19:02:28,348 Common.dll OracleHelper.Execute                    SQL=select * from (select rownum r,t.* from (select ID, NAME, ICON, INSTRUCTIONS, CLASSES, PARENT_ID, PATH, IS_DEFAULT, IS_ENABLE, SORT, OP_GROUP_ID, API_SP_XH_ID, GIVING_NUM, REMARK from GW_PRODUCT where 1=1 and classes=:classes and is_default=:is_default and op_group_id=:op_group_id) t where rownum <= 100000) Message=ORA-01008: 并非所有变量都已绑定
+
+#79  2021-09-30 19:10:34,730 Common.dll OracleHelper.Execute                    SQL=select * from (select rownum r,t.* from (select ID, NAME, ICON, INSTRUCTIONS, CLASSES, PARENT_ID, PATH, IS_DEFAULT, IS_ENABLE, SORT, OP_GROUP_ID, API_SP_XH_ID, GIVING_NUM, REMARK from GW_PRODUCT where 1=1 and classes=:classes and is_default=:is_default) t where rownum <= 100000) Message=ORA-01008: 并非所有变量都已绑定
+

--
Gitblit v1.9.1