~yzh/SMGW_NewWeb.git

parent: 21141fd4 | 补丁 | 提交 | ignore whitespace

yzh

2021-10-09 571fdf242ef681619d739ca4b92cc960a44aace3

Squashed commit of the following:

commit e76da58d55a18a746d021fd96351c48cc9648d7c
Author: yzh <snbbt@21cn.com>
Date:   Sat Oct 9 11:37:56 2021 +0800

    产品管理导出优化

commit 68d730496a69037a8825b940e8e787ab4c212828
Author: yzh <snbbt@21cn.com>
Date:   Sat Oct 9 11:33:49 2021 +0800

    产品管理导出优化

# Conflicts:
#	web/.vs/Web/v16/.suo
#	web/web/logs/err.txt
#	web/web/logs/logx.txt

3个文件已修改

	web/Dao/GwProductDao.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/web/logs/err.txt	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/web/logs/logx.txt	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 web/Dao/GwProductDao.cs

@@ -48,7 +48,7 @@
                stringBuilder.Append(" and op_group_id=:op_group_id");
            }

            stringBuilder.Append(" order by ID DESC");
            stringBuilder.Append(" order by PATH ");
            using (OracleDataReader reader = OracleHelper.ExecuteReader("select count(*) as count " + stringBuilder.ToString(), OracleHelper.Connection, list2.ToArray()))
            {
                while (((DbDataReader)reader).Read())

 web/web/logs/err.txt

@@ -672,6 +672,11 @@
进程 ID: 17820
会话 ID: 14 序列号: 14066



<<<<<<< HEAD

=======

<<<<<<< Develop

=======

>>>>>>> Develop

#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: 无效数字

@@ -680,3 +685,16 @@


#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: 并非所有变量都已绑定



<<<<<<< HEAD

=======

#54  2021-10-08 14:21:58,134 Common.dll OracleHelper.ExecuteReader              ORA-03113: 通信通道的文件结尾
进程 ID: 7520
会话 ID: 69 序列号: 12596

   在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)

   在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)

   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)

   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)

   在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 219



>>>>>>> local

>>>>>>> Develop


 web/web/logs/logx.txt

@@ -672,6 +672,11 @@
进程 ID: 17820
会话 ID: 14 序列号: 14066



<<<<<<< HEAD

=======

<<<<<<< Develop

=======

>>>>>>> Develop

#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: 无效数字

@@ -680,3 +685,16 @@


#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: 并非所有变量都已绑定



<<<<<<< HEAD

=======

#54  2021-10-08 14:21:58,134 Common.dll OracleHelper.ExecuteReader              ORA-03113: 通信通道的文件结尾
进程 ID: 7520
会话 ID: 69 序列号: 12596

   在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)

   在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)

   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)

   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)

   在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 219



>>>>>>> local

>>>>>>> Develop

			@@ -48,7 +48,7 @@
			stringBuilder.Append(" and op_group_id=:op_group_id");
			}

			stringBuilder.Append(" order by ID DESC");
			stringBuilder.Append(" order by PATH ");
			using (OracleDataReader reader = OracleHelper.ExecuteReader("select count(*) as count " + stringBuilder.ToString(), OracleHelper.Connection, list2.ToArray()))
			{
			while (((DbDataReader)reader).Read())

			@@ -672,6 +672,11 @@
			进程 ID: 17820
			会话 ID: 14 序列号: 14066

			<<<<<<< HEAD
			=======
			<<<<<<< Develop
			=======
			>>>>>>> Develop
			#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: 无效数字
			@@ -680,3 +685,16 @@

			#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: 并非所有变量都已绑定

			<<<<<<< HEAD
			=======
			#54 2021-10-08 14:21:58,134 Common.dll OracleHelper.ExecuteReader ORA-03113: 通信通道的文件结尾
			进程 ID: 7520
			会话 ID: 69 序列号: 12596
			在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
			在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
			在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
			在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
			在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 219

			>>>>>>> local
			>>>>>>> Develop