From 4fe97de1b60c2954ee22b443e32d35d79ef6b118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=A4=E6=97=BA?= Date: Fri, 31 May 2024 15:33:26 +0800 Subject: [PATCH] =?UTF-8?q?#TRS-ZS-81=20=E5=AE=A2=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpDAL/DataBase/APEXOracleContext.cs | 42 ------------ .../Modules/ClientModule/ClientDutyService.cs | 55 +--------------- .../ClientModule/ClientImportService.cs | 15 +---- .../导入模板/客户导入_人员信息模板.xlsx | Bin 13418 -> 12427 bytes .../导入模板/客户导入_基本信息模板.xlsx | Bin 7173 -> 6707 bytes YLErpWeb/Controllers/clientController.cs | 20 ------ YLErpWeb/Views/client/_ClientDutyEdit.cshtml | 26 ++++---- YLErpWeb/Views/client/_ClientDutyList.cshtml | 35 ++-------- YLErpWeb/YLErpWeb.csproj | 1 + .../Scripts/app/client/clientEditV2.js | 61 +----------------- 10 files changed, 26 insertions(+), 229 deletions(-) delete mode 100644 YLErpDAL/DataBase/APEXOracleContext.cs diff --git a/YLErpDAL/DataBase/APEXOracleContext.cs b/YLErpDAL/DataBase/APEXOracleContext.cs deleted file mode 100644 index 75f39eb1..00000000 --- a/YLErpDAL/DataBase/APEXOracleContext.cs +++ /dev/null @@ -1,42 +0,0 @@ - -using Microsoft.Extensions.Logging; -using YLErp.DataBase.Interceptors; - -namespace YLErp.DataBase -{ - public class APEXOracleContext:DbContext - { - private LogLevel _logLevel; - [System.Diagnostics.Conditional("DEBUG")] - public void SetDebugLog() - { - _logLevel = LogLevel.Debug; - } - protected string GetConnectionString() => AppManager.GetConnectionString("apex_oracle"); - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - { - var connectionString = GetConnectionString(); - optionsBuilder.LogTo(log => - { - if (_logLevel == LogLevel.Debug) - { - System.Diagnostics.Debug.WriteLine(log); - } - }); - - if (_logLevel == LogLevel.Debug) - { - optionsBuilder.AddInterceptors(DgDbCommandInterceptor.Default); - } - optionsBuilder.UseOracle(connectionString); - } - protected override void OnModelCreating(ModelBuilder modelBuilder) - { - modelBuilder.HasDefaultSchema(Environment.GetEnvironmentVariable("OrcaleDatabaseConfig_Schema")); // 设置默认模式 - - // 配置实体和其他模型设置 - } - // 声明数据库中的实体集合 - public DbSet ClientAMRNetBaseInfos { get; set; } - } -} diff --git a/YLErpDAL/Modules/ClientModule/ClientDutyService.cs b/YLErpDAL/Modules/ClientModule/ClientDutyService.cs index 7660792f..fface601 100644 --- a/YLErpDAL/Modules/ClientModule/ClientDutyService.cs +++ b/YLErpDAL/Modules/ClientModule/ClientDutyService.cs @@ -345,61 +345,10 @@ namespace YLErp.Modules.ClientModule return string.Join(",", result); }), - new ExcelHelper.DataColumnModel("证件类型", "IdCardType", (cv, obj) => - { - return Enum.GetName(typeof(IdCardTypeEnum), cv); - }), - new ExcelHelper.DataColumnModel("证件号码", "IdCardNo", typeof(string)), new ExcelHelper.DataColumnModel("电子邮箱", "Email", typeof(string)), - new ExcelHelper.DataColumnModel("是否接收相关邮件", "IsReceiveEmail", (cv, obj) => - { - if (cv!=null) - { - var status = (int)cv; - return status == 1 ? "是" : "否"; - }else - { - return null; - } - - }), - new ExcelHelper.DataColumnModel("联系电话", "PhoneNumber", typeof(string)), - new ExcelHelper.DataColumnModel("传真", "Fax", typeof(string)), - new ExcelHelper.DataColumnModel("联系地址", "Address", typeof(string)) + }; - if (!(PS.Config.Company == CompanyEnum.招证) && !(PS.Config.Company == CompanyEnum.东吴)) - { - dc.Add(new ExcelHelper.DataColumnModel("证件有效日期", "IdCardEffectiveDate", (cv, obj) => - { - var date = (DateTime?)cv; - if (date != null) - { - var flag = ((DateTime)date).ToString("yyyy-MM-dd") == "3000-12-31"; - return flag ? "长期有效" : ((DateTime)date).ToString("yyyy-MM-dd"); - } - else - { - return null; - } - })); - } - if (PS.Config.Company == CompanyEnum.招证 || PS.Config.Company == CompanyEnum.东吴) - { - dc.Add(new ExcelHelper.DataColumnModel("证件到期日", "DeadLine", (cv, obj) => - { - var date = (DateTime?)cv; - return date != null ? ((DateTime)date).ToString("yyyy-MM-dd") : ""; - })); - dc.Add(new ExcelHelper.DataColumnModel("授权到期日", "AuthorizeEndDate", (cv, obj) => - { - var date = (DateTime?)cv; - return date != null ? ((DateTime)date).ToString("yyyy-MM-dd") : ""; - })); - if (PS.Config.Company == CompanyEnum.东吴) - { - dc.Add(new ExcelHelper.DataColumnModel("微信号", "Weixin", typeof(string))); - } - } + new ExcelHelper().ListToExcel(dc.ToArray(), ret, "客户人员信息", true, out var buffer); return buffer; } diff --git a/YLErpDAL/Modules/ClientModule/ClientImportService.cs b/YLErpDAL/Modules/ClientModule/ClientImportService.cs index 8897d77f..562d4ea9 100644 --- a/YLErpDAL/Modules/ClientModule/ClientImportService.cs +++ b/YLErpDAL/Modules/ClientModule/ClientImportService.cs @@ -1709,19 +1709,8 @@ namespace YLErp.Modules.ClientModule } } - - if (IsReceiveEmailString == "是") - { - IsReceiveEmail = 1; - } - else if (!string.IsNullOrEmpty(IsReceiveEmailString) && IsReceiveEmailString != "否") - { - return "第" + rowNum + "行是否接收邮件:" + IsReceiveEmailString + "不合法,导入失败"; - } - else - { - IsReceiveEmail = 0; - } + //默认为1 + IsReceiveEmail = 1; if (DbContext.client_black.Any(c => c.Name == Name)) { return "" + Name + "客户已经存在于黑名单中"; diff --git a/YLErpWeb/App_Docs/导入模板/客户导入_人员信息模板.xlsx b/YLErpWeb/App_Docs/导入模板/客户导入_人员信息模板.xlsx index 0393e77afaa7790c52b21d97cfa0099942f9cc26..fa5ea51620be9d63f63919c64ef32021f29b3148 100644 GIT binary patch delta 5599 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 C8an_0 diff --git a/YLErpWeb/App_Docs/导入模板/客户导入_基本信息模板.xlsx b/YLErpWeb/App_Docs/导入模板/客户导入_基本信息模板.xlsx index 8dc0cd78050e619a741409ff1531363da77e6a7f..900d5e9b441d9c3c77ae9f9e5617b422dc8d3d94 100644 GIT binary patch delta 3208 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 diff --git a/YLErpWeb/Controllers/clientController.cs b/YLErpWeb/Controllers/clientController.cs index 102b70cc..3cc4ddc8 100644 --- a/YLErpWeb/Controllers/clientController.cs +++ b/YLErpWeb/Controllers/clientController.cs @@ -3478,25 +3478,5 @@ namespace YLErp.Web.Controllers new ClientProcessLogService(CurUser).revertBankDutyFile(clientId); return JsonSuccess(); } - /// - /// 根据客户名称模糊匹配数据 - /// - /// - /// - public JsonResult SearchClientUsccCodes(string name) - { - if (string.IsNullOrEmpty(name)) - { - return JsonSuccess(); - } - using APEXOracleContext aPEXOracleContext = new APEXOracleContext(); - var schame = Environment.GetEnvironmentVariable("OrcaleDatabaseConfig_Schema"); - var sqlstr = $"SELECT REC_ID,ENT_NAME,USCC_CODE FROM {schame}.AMR_N042_ENT_BASEINFO_COPY WHERE CONTAINS(ENT_NAME, '{name}',1) > 0 AND ROWNUM <= 10"; - // var sqlstr = $"SELECT REC_ID,ENT_NAME,USCC_CODE FROM {schame}.AMR_N042_ENT_BASEINFO_COPY WHERE ENT_NAME like '{name}%' AND ROWNUM <= 10"; - var conn= aPEXOracleContext.Database.GetDbConnection(); - var usccCodes = conn.Query(sqlstr); - //var usccCodes= aPEXOracleContext.ClientAMRNetBaseInfos.Where(x => x.ENT_NAME.StartsWith(name)).Select(s=>new {s.ENT_NAME,s.USCC_CODE}).ToList(); - return JsonSuccess("", usccCodes); - } } } \ No newline at end of file diff --git a/YLErpWeb/Views/client/_ClientDutyEdit.cshtml b/YLErpWeb/Views/client/_ClientDutyEdit.cshtml index 0ab1c19a..5c46258e 100644 --- a/YLErpWeb/Views/client/_ClientDutyEdit.cshtml +++ b/YLErpWeb/Views/client/_ClientDutyEdit.cshtml @@ -22,25 +22,25 @@ * -
+ -
+ -
+ -
+ -
+ -
+
-
+ -
+ -
+ -
+ -
+ -
+ -
+ diff --git a/YLErpWeb/Views/client/_ClientDutyList.cshtml b/YLErpWeb/Views/client/_ClientDutyList.cshtml index 292576b1..5a537546 100644 --- a/YLErpWeb/Views/client/_ClientDutyList.cshtml +++ b/YLErpWeb/Views/client/_ClientDutyList.cshtml @@ -15,42 +15,19 @@ 姓名 - 职责类型 - 证件类型 - 证件号码 - 证件有效日期 - 联系电话 - 传真 - 电子邮箱 - 接收邮件 - 联系地址 - 有效日期 - 证件有效日期 - 证件到期日 - 授权到期日 - 微信号 - 备注 - 操作 + 职责类型 + 电子邮箱 + 备注 + 操作 {{item.ContactName}} {{item.ContactTypeStr}} - {{item.IdCardType}} - {{item.IdCardNo}} - {{item.IdCardDate}} - -
{{item2}}
- - {{item.Fax}} + {{item.EmailStr}} - {{item.IsReceiveEmail === 1?"是":"否"}} - {{item.Address}} - {{item.DeadLine}} - {{item.IdCardEffectiveDateStr == "30001231"?"长期有效":item.IdCardEffectiveDate}} - {{item.AuthorizeEndDate}} - {{item.Weixin}} + {{item.Remarks}}