From 571fdf242ef681619d739ca4b92cc960a44aace3 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期六, 09 十月 2021 13:51:06 +0800
Subject: [PATCH] Squashed commit of the following:
---
web/Dao/GwProductDao.cs | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/web/Dao/GwProductDao.cs b/web/Dao/GwProductDao.cs
index 3494133..c9be952 100644
--- a/web/Dao/GwProductDao.cs
+++ b/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())
@@ -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");
}
--
Gitblit v1.9.1