Commit 03237050 authored by 黄奎's avatar 黄奎

新增字段

parent 7fa36a61
...@@ -63,5 +63,15 @@ namespace Edu.Model.Entity.Customer ...@@ -63,5 +63,15 @@ namespace Edu.Model.Entity.Customer
/// 状态 /// 状态
/// </summary> /// </summary>
public DateStateEnum Status { get; set; } public DateStateEnum Status { get; set; }
/// <summary>
/// 是否签约(1-已签约)
/// </summary>
public int IsContract { get; set; }
/// <summary>
/// 合同附件
/// </summary>
public string ContractUrl { get; set; }
} }
} }
...@@ -646,6 +646,10 @@ namespace Edu.Module.Customer ...@@ -646,6 +646,10 @@ namespace Edu.Module.Customer
public bool SetCustomerCategoryModule(RB_Customer_Category_Extend model) public bool SetCustomerCategoryModule(RB_Customer_Category_Extend model)
{ {
bool flag = false; bool flag = false;
if (model.IsContract == 0)
{
model.ContractUrl = "";
}
if (model.CategoryId > 0) if (model.CategoryId > 0)
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
...@@ -654,6 +658,8 @@ namespace Edu.Module.Customer ...@@ -654,6 +658,8 @@ namespace Edu.Module.Customer
{ nameof(RB_Customer_Category_Extend.CatetoryType),model.CatetoryType}, { nameof(RB_Customer_Category_Extend.CatetoryType),model.CatetoryType},
{ nameof(RB_Customer_Category_Extend.UpdateBy),model.UpdateBy}, { nameof(RB_Customer_Category_Extend.UpdateBy),model.UpdateBy},
{ nameof(RB_Customer_Category_Extend.UpdateTime),model.UpdateTime}, { nameof(RB_Customer_Category_Extend.UpdateTime),model.UpdateTime},
{ nameof(RB_Customer_Category_Extend.IsContract),model.IsContract},
{ nameof(RB_Customer_Category_Extend.ContractUrl),model.ContractUrl},
}; };
flag = customer_CategoryRepository.Update(fileds, new WhereHelper(nameof(RB_Customer_Category_Extend.CategoryId), model.CategoryId)); flag = customer_CategoryRepository.Update(fileds, new WhereHelper(nameof(RB_Customer_Category_Extend.CategoryId), model.CategoryId));
} }
......
...@@ -948,6 +948,8 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -948,6 +948,8 @@ namespace Edu.WebApi.Controllers.Customer
Group_Id = base.UserInfo.Group_Id, Group_Id = base.UserInfo.Group_Id,
CategoryName = base.ParmJObj.GetStringValue("CategoryName"), CategoryName = base.ParmJObj.GetStringValue("CategoryName"),
CatetoryType=(CatetoryTypeEnum)base.ParmJObj.GetInt("CatetoryType"), CatetoryType=(CatetoryTypeEnum)base.ParmJObj.GetInt("CatetoryType"),
IsContract=base.ParmJObj.GetInt("IsContract"),
ContractUrl=base.ParmJObj.GetStringValue("ContractUrl"),
}; };
int IsQueryAll = base.ParmJObj.GetInt("IsQueryAll"); int IsQueryAll = base.ParmJObj.GetInt("IsQueryAll");
if (IsQueryAll ==0) if (IsQueryAll ==0)
...@@ -969,6 +971,8 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -969,6 +971,8 @@ namespace Edu.WebApi.Controllers.Customer
item.LinkManCount, item.LinkManCount,
item.StudentCount, item.StudentCount,
item.OrderCount, item.OrderCount,
item.IsContract,
item.ContractUrl,
CatetoryTypeName = item.CatetoryType.ToName(), CatetoryTypeName = item.CatetoryType.ToName(),
CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime), CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
}); });
...@@ -992,6 +996,8 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -992,6 +996,8 @@ namespace Edu.WebApi.Controllers.Customer
Group_Id = base.UserInfo.Group_Id, Group_Id = base.UserInfo.Group_Id,
CategoryName = base.ParmJObj.GetStringValue("CategoryName"), CategoryName = base.ParmJObj.GetStringValue("CategoryName"),
CatetoryType = (CatetoryTypeEnum)base.ParmJObj.GetInt("CatetoryType"), CatetoryType = (CatetoryTypeEnum)base.ParmJObj.GetInt("CatetoryType"),
IsContract = base.ParmJObj.GetInt("IsContract"),
ContractUrl = base.ParmJObj.GetStringValue("ContractUrl"),
}; };
int IsQueryAll = base.ParmJObj.GetInt("IsQueryAll"); int IsQueryAll = base.ParmJObj.GetInt("IsQueryAll");
if (IsQueryAll == 0) if (IsQueryAll == 0)
...@@ -1087,6 +1093,8 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -1087,6 +1093,8 @@ namespace Edu.WebApi.Controllers.Customer
CategoryId= CategoryId, CategoryId= CategoryId,
CategoryName = base.ParmJObj.GetStringValue("CategoryName").Trim(), CategoryName = base.ParmJObj.GetStringValue("CategoryName").Trim(),
CatetoryType = (CatetoryTypeEnum)base.ParmJObj.GetInt("CatetoryType"), CatetoryType = (CatetoryTypeEnum)base.ParmJObj.GetInt("CatetoryType"),
IsContract=base.ParmJObj.GetInt("IsContract"),
ContractUrl=base.ParmJObj.GetStringValue("ContractUrl"),
}; };
var linkMan = base.ParmJObj.GetStringValue("linkMan"); var linkMan = base.ParmJObj.GetStringValue("linkMan");
var linkTel = base.ParmJObj.GetStringValue("linkTel"); var linkTel = base.ParmJObj.GetStringValue("linkTel");
...@@ -1167,6 +1175,8 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -1167,6 +1175,8 @@ namespace Edu.WebApi.Controllers.Customer
extModel?.CategoryName, extModel?.CategoryName,
extModel?.CatetoryType, extModel?.CatetoryType,
CatetoryTypeName=extModel?.CatetoryType.ToName()??"", CatetoryTypeName=extModel?.CatetoryType.ToName()??"",
extModel?.ContractUrl,
extModel?.IsContract,
}; };
return ApiResult.Success(data: obj); return ApiResult.Success(data: obj);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment