Commit 4fc88d0d authored by 吴春's avatar 吴春

1

parent a8503b2a
......@@ -43,5 +43,10 @@ namespace Mall.Model.Extend.TradePavilion
/// 结束时间
/// </summary>
public string EndTime { get; set; }
/// <summary>
/// 物业需求
/// </summary>
public List<string> PropertyDemandList { get; set; }
}
}
......@@ -35,5 +35,10 @@ namespace Mall.Model.Extend.TradePavilion
/// 收藏id
/// </summary>
public int CollectId { get; set; }
/// <summary>
/// 物业服务
/// </summary>
public List<string> PropertyDemandList { get; set; }
}
}
......@@ -306,7 +306,7 @@ namespace Mall.Module.TradePavilion
{ nameof(RB_EnterpriseServicesApply_Extend.UpdateBy),model.UpdateBy},
{ nameof(RB_EnterpriseServicesApply_Extend.UpdateDate),model.UpdateDate},
{ nameof(RB_EnterpriseServicesApply_Extend.EType),model.EType},
};
flag = enterpriseServicesApplyRepository.Update(fileds, new WhereHelper(nameof(RB_EnterpriseServicesApply_Extend.ID), model.ID));
}
......@@ -352,7 +352,7 @@ namespace Mall.Module.TradePavilion
{ nameof(RB_EnterpriseServices.UpdateBy),BrandModel.UpdateBy},
{ nameof(RB_EnterpriseServices.UpdateDate),BrandModel.UpdateDate},
{ nameof(RB_EnterpriseServices.EType),BrandModel.EType},
};
enterpriseServicesRepository.Update(filedsBrand, new WhereHelper(nameof(RB_EnterpriseServices.ServiceId), BrandModel.ExistServiceId));
}
......@@ -812,13 +812,22 @@ namespace Mall.Module.TradePavilion
{
model.BrandModel.BannerList = new List<string>();
}
if (!string.IsNullOrWhiteSpace(model.BrandModel.PropertyDemand))
{
model.BrandModel.PropertyDemandList = JsonConvert.DeserializeObject<List<string>>(model.BrandModel.PropertyDemand);
}
else
{
model.BrandModel.PropertyDemandList = new List<string>();
}
}
else
{
model.BrandModel = new RB_BrandEnterpriseApplyFor_Extend
{
BannerList = new List<string>(),
CustomerTypeInfo = new List<string>()
CustomerTypeInfo = new List<string>(),
PropertyDemandList = new List<string>()
};
}
}
......@@ -921,13 +930,22 @@ namespace Mall.Module.TradePavilion
{
model.BrandModel.BannerList = new List<string>();
}
if (!string.IsNullOrWhiteSpace(model.BrandModel.PropertyDemand))
{
model.BrandModel.PropertyDemandList = JsonConvert.DeserializeObject<List<string>>(model.BrandModel.PropertyDemand);
}
else
{
model.BrandModel.PropertyDemandList = new List<string>();
}
}
else
{
model.BrandModel = new RB_BrandEnterpriseApplyFor_Extend
{
BannerList = new List<string>(),
CustomerTypeInfo = new List<string>()
CustomerTypeInfo = new List<string>(),
PropertyDemandList = new List<string>(),
};
}
}
......@@ -1171,7 +1189,14 @@ namespace Mall.Module.TradePavilion
{
model.BrandModel.BannerList = new List<string>();
}
if (!string.IsNullOrWhiteSpace(model.BrandModel.PropertyDemand))
{
model.BrandModel.PropertyDemandList = JsonConvert.DeserializeObject<List<string>>(model.BrandModel.PropertyDemand);
}
else
{
model.BrandModel.PropertyDemandList = new List<string>();
}
model.BrandModel.ProjectName = model.BrandModel.ProjectType.GetEnumName();
}
}
......
......@@ -3550,6 +3550,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
query.CreateDate = System.DateTime.Now;
query.CreateBy = userInfo.UserId;
}
if (query.PropertyDemandList != null && query.PropertyDemandList.Any())
{
query.PropertyDemand = string.Join(",", query.PropertyDemandList.Select(x => x));
}
else
{
query.PropertyDemand = "";
}
query.MallBaseId = userInfo.MallBaseId;
query.TenantId = userInfo.TenantId;
query.Status = 0;
......
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