wzp
2023-03-02 1b9a56fcf3ffcf0f69ed8b7447322d0a75ba99ac
清理dataAccess,避免报错
3个文件已添加
35个文件已修改
8个文件已删除
1 文件已重命名
56 ■■■■ 已修改文件
web/.vs/Web/FileContentIndex/0419d2ad-ced8-4447-bad9-7b5701b335d8.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
web/.vs/Web/FileContentIndex/35892b4e-5b0f-443d-8ced-4605fd70028a.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
web/.vs/Web/FileContentIndex/79694cf4-4ab6-42a5-9a88-3040eca22d51.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
web/.vs/Web/FileContentIndex/8f696eb1-6627-4ae6-821d-6d56c98f9654.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
web/.vs/Web/FileContentIndex/cad8a964-ece6-41ac-8981-776149d44edf.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
web/.vs/Web/FileContentIndex/cf8e3a47-4342-4b42-9d08-a578e612f6de.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
web/.vs/Web/FileContentIndex/dc428d8c-5b83-4e50-a072-d4c3105f76ab.vsidx 补丁 | 查看 | 原始文档 | blame | 历史
web/.vs/Web/config/applicationhost.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/.vs/Web/v17/.suo 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/bin/Release/Oracle.DataAccess.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Common/lib/Oracle.DataAccess.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/Dao.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/GwClientDao.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Common.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Common.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Dao.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Dao.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Dao/bin/Release/Oracle.DataAccess.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/App_Code.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Common.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Common.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Dao.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Dao.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/Oracle.DataAccess.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Lib/UMCLib.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Model/bin/Release/Oracle.DataAccess.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/Web.sln 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/App_Code.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/App_Code.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Common.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Common.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Dao.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Dao.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Bin/UMCLib.pdb 补丁 | 查看 | 原始文档 | blame | 历史
web/web/ExportDocument.aspx.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/web/GwClient.ashx 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/web/GwClient.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/web/GwClientSub.aspx 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/web/GwTransfer.ashx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/web/Index.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/web/website.publishproj 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/.vs/Web/FileContentIndex/0419d2ad-ced8-4447-bad9-7b5701b335d8.vsidx
Binary files differ
web/.vs/Web/FileContentIndex/35892b4e-5b0f-443d-8ced-4605fd70028a.vsidx
Binary files differ
web/.vs/Web/FileContentIndex/79694cf4-4ab6-42a5-9a88-3040eca22d51.vsidx
Binary files differ
web/.vs/Web/FileContentIndex/8f696eb1-6627-4ae6-821d-6d56c98f9654.vsidx
Binary files differ
web/.vs/Web/FileContentIndex/cad8a964-ece6-41ac-8981-776149d44edf.vsidx
Binary files differ
web/.vs/Web/FileContentIndex/cf8e3a47-4342-4b42-9d08-a578e612f6de.vsidx
Binary files differ
web/.vs/Web/FileContentIndex/dc428d8c-5b83-4e50-a072-d4c3105f76ab.vsidx
Binary files differ
web/.vs/Web/config/applicationhost.config
@@ -162,7 +162,7 @@
            </site>
            <site name="web" id="2">
                <application path="/" applicationPool="Clr4IntegratedAppPool">
                    <virtualDirectory path="/" physicalPath="C:\Users\mac\Desktop\RDream\SMGW_NewWeb\web\web" />
                    <virtualDirectory path="/" physicalPath="C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewWeb\web\web" />
                </application>
                <bindings>
                    <binding protocol="http" bindingInformation="*:60960:localhost" />
web/.vs/Web/v17/.suo
Binary files differ
web/Common/bin/Release/Oracle.DataAccess.dll
Binary files differ
web/Common/lib/Oracle.DataAccess.dll
Binary files differ
web/Dao/Dao.csproj
@@ -36,7 +36,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>..\Lib\</OutputPath>
    <OutputPath>bin\Release\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
web/Dao/GwClientDao.cs
@@ -29,7 +29,7 @@
        /// <param name="productId">产品ID</param>
        /// <returns></returns>
        //public List<GwClient> LoadInfoList(out int recordCount, int pageIndex, int pageSizestring, string clientID, string clientName, string telphone, string agent)
        public List<GwClient> LoadInfoList(out int recordCount, int pageIndex, int pageSizestring, string clientID, string clientName, string telephone, string agent, string company, string salesman, string supportStaff, string productId, int isEnable, string permissionsSQL )
        public List<GwClient> LoadInfoList(out int recordCount, int pageIndex, int pageSizestring, string clientID, string clientName, string telephone, string agent, string company, string salesman, string supportStaff, string productId, int isEnable,int isSub, string permissionsSQL )
        {
            List<GwClient> list = new List<GwClient>();
@@ -46,7 +46,7 @@
                stringBuilder.Append(" ) t on t.client_id = gwc.client_id ");
                //stringBuilder.Append("from GW_CLIENT where 1=1");
                stringBuilder.Append(" WHERE 1=1");
                OracleParameter[] oracleParameterArray = new OracleParameter[8];
                OracleParameter[] oracleParameterArray = new OracleParameter[9];
                if (clientID != null && clientID != "")
                {
                    oracleParameterArray[0] = new OracleParameter(":ClientID", (OracleDbType)126);
@@ -97,11 +97,27 @@
                    stringBuilder.Append(" and gwc.IS_ENABLE = :IS_ENABLE");
                }
                //是否一级账户。0为一级
                if (isSub == 0)
                {
                    oracleParameterArray[8] = new OracleParameter(":CLIENT_PARENTID", OracleDbType.Int32);
                    ((DbParameter)oracleParameterArray[8]).Value = (object)(isSub);
                    stringBuilder.Append(" and gwc.CLIENT_PARENTID = :CLIENT_PARENTID");
                }
                else
                {
                    oracleParameterArray[8] = new OracleParameter(":CLIENT_PARENTID", OracleDbType.Int32);
                    ((DbParameter)oracleParameterArray[8]).Value = (object)(isSub);
                    stringBuilder.Append(" and gwc.CLIENT_PARENTID != :CLIENT_PARENTID");
                }
                if (productId != null && productId != "")
                {
                    stringBuilder.Append(" and gwc.CLIENT_ID IN ( SELECT distinct CLIENT_ID  FROM GW_SP WHERE PRODUCT_ID = '" + productId + "' )");
                }
                //客户权限SQL脚本
                stringBuilder.Append(permissionsSQL);
web/Dao/bin/Release/Common.dll
Binary files differ
web/Dao/bin/Release/Common.pdb
Binary files differ
web/Dao/bin/Release/Dao.dll
Binary files differ
web/Dao/bin/Release/Dao.pdb
Binary files differ
web/Dao/bin/Release/Model.dll
Binary files differ
web/Dao/bin/Release/Model.pdb
Binary files differ
web/Dao/bin/Release/Oracle.DataAccess.dll
Binary files differ
web/Lib/App_Code.dll
Binary files differ
web/Lib/Common.dll
Binary files differ
web/Lib/Common.pdb
Binary files differ
web/Lib/Dao.dll
Binary files differ
web/Lib/Dao.pdb
Binary files differ
web/Lib/Model.dll
Binary files differ
web/Lib/Model.pdb
Binary files differ
web/Lib/Oracle.DataAccess.dll
Binary files differ
web/Lib/UMCLib.dll
Binary files differ
web/Model/bin/Release/Oracle.DataAccess.dll
Binary files differ
web/Web.sln
@@ -13,7 +13,7 @@
    EndProjectSection
    ProjectSection(WebsiteProperties) = preProject
        TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
        ProjectReferences = ""
        ProjectReferences = "{6199dc29-d043-41b0-bdfd-afa19adc7848}|App_Code.dll;{d0cdbf9c-d79a-434f-adb0-0a58b7b5e1d6}|Dao.dll;{337CD576-BA09-4182-9FDD-8F1AB1B30624}|Model.dll;"
        Debug.AspNetCompiler.VirtualPath = "/Web"
        Debug.AspNetCompiler.PhysicalPath = "Web\"
        Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Web\"
web/web/Bin/App_Code.dll
Binary files differ
web/web/Bin/App_Code.pdb
Binary files differ
web/web/Bin/Common.dll
Binary files differ
web/web/Bin/Common.pdb
Binary files differ
web/web/Bin/Dao.dll
Binary files differ
web/web/Bin/Dao.pdb
Binary files differ
web/web/Bin/Model.dll
Binary files differ
web/web/Bin/Model.pdb
Binary files differ
web/web/Bin/UMCLib.pdb
Binary files differ
web/web/ExportDocument.aspx.cs
@@ -365,11 +365,13 @@
        int recordCount = 0;
        int pageSize = this.AppContext.GetInt("pageSize", 999999999);
        int isSub = AppContext.GetInt("isSub",0);
        string str = "";
        using (GwClientDao dao = new GwClientDao())
        {
            string permissionsSQL = dao.GetClientPermissions(_userId, _userType, "gwc");
            var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, SupportStaff, ProductId, IsEnable, permissionsSQL);
            var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, SupportStaff, ProductId, IsEnable,isSub, permissionsSQL);
            if (recordCount> 1000000)
            {
                this.Response.Write("<script type='text/javascript'>alert('导出数据不能大于100万条!');location.href='GwClient.aspx?IsEnable=" + IsEnable + "';</script>");
web/web/GwClient.ashx
@@ -117,11 +117,13 @@
        string serverIp = ConfigurationManager.AppSettings["serverIp"];
        string clientPort = ConfigurationManager.AppSettings["clientPort"];
        int isSub = context.GetInt("isSub",0);
        string str = "";
        using (GwClientDao dao = new GwClientDao())
        {
            string permissionsSQL = dao.GetClientPermissions(_userId, _userType, "gwc");
            var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, SupportStaff, ProductId, IsEnable, permissionsSQL);
            var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, SupportStaff, ProductId, IsEnable,isSub, permissionsSQL);
            if (list != null && list.Count > 0)
            {
web/web/GwClient.aspx
@@ -254,10 +254,6 @@
                            }
                        }
                    });
                    //swal.close();
                    //}
                    //});
                }
            });
web/web/GwClientSub.aspx
@@ -349,10 +349,11 @@
            var SupportStaff = $("#SupportStaff").val();
            var ProductId = $("#ProductId").val();
            var IsEnable = <%=IsEnable%>;
            let isSub = 1;
            $.ajax({
                url: "GwClient.ashx",
                type: "POST",
                data: { action: "loadGwClientPageList", ClientID: ClientID, Company: Company, ClientName: ClientName, Telephone: Telephone, Agent: Agent, Salesman: Salesman, SupportStaff: SupportStaff, ProductId: ProductId, IsEnable: IsEnable , pageSize: $("#pager").Pager("getPageSize"), pageIndex: $("#pager").Pager("getPageIndex") },
                data: { action: "loadGwClientPageList", isSub: isSub, ClientID: ClientID, Company: Company, ClientName: ClientName, Telephone: Telephone, Agent: Agent, Salesman: Salesman, SupportStaff: SupportStaff, ProductId: ProductId, IsEnable: IsEnable, pageSize: $("#pager").Pager("getPageSize"), pageIndex: $("#pager").Pager("getPageIndex") },
                success: function (result) {
                    if (result.OK) {
                        $("#gwclientTable tbody").html(result.Message.Table);
web/web/GwTransfer.ashx
@@ -2,7 +2,6 @@
using System;
using System.Web;
//using com.softwee.smgw.common;
using Dao;
using Model;
using System.Collections.Generic;
web/web/Index.aspx
@@ -145,7 +145,7 @@
                        <a href="#"><i class="fa fa-user-secret"></i><span class="nav-label">客户管理 </span><span class="fa arrow"></span></a>
                        <ul class="nav nav-second-level">
                            <li><a href="GwClient.aspx?IsEnable=1" class="J_menuItem">客户信息管理</a> </li>
                             <li><a href="GwClient.aspx?IsEnable=1" class="J_menuItem">分销商下级客户信息管理</a> </li>
                             <li><a href="GwClientSub.aspx?IsEnable=1" class="J_menuItem">分销商下级客户信息管理</a> </li>
                            <li><a href="GwClient.aspx?IsEnable=0" class="J_menuItem">停用客户信息管理</a> </li>
                            <li><a href="GwSp.aspx" class="J_menuItem">短信账号管理</a> </li>
web/web/website.publishproj
@@ -48,18 +48,6 @@
      <Project>{6199DC29-D043-41B0-BDFD-AFA19ADC7848}</Project>
      <Name>App_Code</Name>
    </ProjectReference>
    <ProjectReference Include="..\Dao\Dao.csproj">
      <Project>{D0CDBF9C-D79A-434F-ADB0-0A58B7B5E1D6}</Project>
      <Name>Dao</Name>
    </ProjectReference>
    <ProjectReference Include="..\Model\Model.csproj">
      <Project>{337CD576-BA09-4182-9FDD-8F1AB1B30624}</Project>
      <Name>Model</Name>
    </ProjectReference>
    <ProjectReference Include="..\UMCLib\UMCLib.csproj">
      <Project>{AA804FAB-0293-4EB3-BF43-8103F1CC93F5}</Project>
      <Name>UMCLib</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(_WebPublishTargetsPath)\Web\Microsoft.WebSite.Publishing.targets" />
</Project>