Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#TRS-ZS-81 客户信息配置

Browse Source
This commit is contained in:
汤旺
2024-05-31 15:33:26 +08:00
parent effc5b066a
commit 4fe97de1b6
10 changed files with 26 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/ClientModule/ClientDutyService.cs
+2 -53
View File
@@ -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<ClientDuty>(dc.ToArray(), ret, "客户人员信息", true, out var buffer);
return buffer;
}
YLErpDAL/Modules/ClientModule/ClientImportService.cs
+2 -13
View File
@@ -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 + "客户已经存在于黑名单中";