Commit ff96e55b authored by 吴春's avatar 吴春
parents 9a7280ab 75d5bc33
...@@ -59,12 +59,12 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -59,12 +59,12 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary> /// <summary>
/// 楼层数 /// 楼层数
/// </summary> /// </summary>
public int FloorNum { get; set; } public string FloorNum { get; set; }
/// <summary> /// <summary>
/// 电梯数 /// 电梯数
/// </summary> /// </summary>
public int ElevatorNum { get; set; } public string ElevatorNum { get; set; }
/// <summary> /// <summary>
/// 层高 /// 层高
......
...@@ -74,12 +74,12 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -74,12 +74,12 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary> /// <summary>
/// 意向楼层 /// 意向楼层
/// </summary> /// </summary>
public int IntentionalFloor { get; set; } public string IntentionalFloor { get; set; }
/// <summary> /// <summary>
/// 电梯数 /// 电梯数
/// </summary> /// </summary>
public int ElevatorNum { get; set; } public string ElevatorNum { get; set; }
/// <summary> /// <summary>
/// 物业费(元/㎡) /// 物业费(元/㎡)
......
...@@ -1103,9 +1103,9 @@ namespace Mall.Module.TradePavilion ...@@ -1103,9 +1103,9 @@ namespace Mall.Module.TradePavilion
/// <param name="rowsCount"></param> /// <param name="rowsCount"></param>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_CompanyEnterprise_Extend> GetCompanyEnterprisePageListModule(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query) public List<RB_CompanyEnterprise_Extend> GetCompanyEnterprisePageModule(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
{ {
var list = companyEnterpriseRepository.GetCompanyPageListRepository(pageIndex, pageSize, out rowsCount, query); var list = companyEnterpriseRepository.GetCompanyEnterprisePageRepository(pageIndex, pageSize, out rowsCount, query);
if (list != null && list.Any()) if (list != null && list.Any())
{ {
//查询用户列表 //查询用户列表
...@@ -1114,11 +1114,10 @@ namespace Mall.Module.TradePavilion ...@@ -1114,11 +1114,10 @@ namespace Mall.Module.TradePavilion
foreach (var item in list) foreach (var item in list)
{ {
var umodel = ulist.Where(x => x.Id == item.CreateBy).FirstOrDefault(); var umodel = ulist.Where(x => x.Id == item.CreateBy).FirstOrDefault();
item.UserName = umodel.Name; item.UserName = umodel?.Name ?? "";
item.UserIcon = umodel.Photo; item.UserIcon = umodel?.Photo ?? "";
} }
} }
return list; return list;
} }
......
...@@ -22,7 +22,7 @@ namespace Mall.Repository.TradePavilion ...@@ -22,7 +22,7 @@ namespace Mall.Repository.TradePavilion
/// <param name="rowsCount"></param> /// <param name="rowsCount"></param>
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_CompanyEnterprise_Extend> GetCompanyPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query) public List<RB_CompanyEnterprise_Extend> GetCompanyEnterprisePageRepository(int pageIndex, int pageSize, out long rowsCount, RB_CompanyEnterprise_Extend query)
{ {
rowsCount = 0; rowsCount = 0;
DynamicParameters parameters = new DynamicParameters(); DynamicParameters parameters = new DynamicParameters();
......
...@@ -3361,7 +3361,7 @@ namespace Mall.WebApi.Controllers ...@@ -3361,7 +3361,7 @@ namespace Mall.WebApi.Controllers
//宜宾商再通特色颜色处理 //宜宾商再通特色颜色处理
if ((miniProgram.TenantId ?? 0) == 30) if ((miniProgram.TenantId ?? 0) == 30)
{ {
resultMallShopStyle = new ResultMallShopStyle() { main = "#017edf", secondary = "#ea850", IsEducation = 0 }; resultMallShopStyle = new ResultMallShopStyle() { main = "#017edf", secondary = "#ea8505", IsEducation = 0 };
} }
break; break;
case MallShopStyleEnum.PureBlack: case MallShopStyleEnum.PureBlack:
......
...@@ -3911,7 +3911,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -3911,7 +3911,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
}; };
query.MallBaseId = userInfo.MallBaseId; query.MallBaseId = userInfo.MallBaseId;
query.TenantId = userInfo.TenantId; query.TenantId = userInfo.TenantId;
var list = buildingCarrierModule.GetCompanyEnterprisePageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query); var list = buildingCarrierModule.GetCompanyEnterprisePageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
pageModel.count = Convert.ToInt32(rowsCount); pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list; pageModel.pageData = list;
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
......
...@@ -4490,7 +4490,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -4490,7 +4490,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
}; };
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId; query.TenantId = RequestParm.TenantId;
var list = buildingCarrierModule.GetCompanyEnterprisePageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query); var list = buildingCarrierModule.GetCompanyEnterprisePageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
pageModel.count = Convert.ToInt32(rowsCount); pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list; pageModel.pageData = list;
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
......
...@@ -116,8 +116,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -116,8 +116,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
CategoryId=parms.GetInt("CategoryId"), CategoryId=parms.GetInt("CategoryId"),
Areas=parms.GetStringValue("Areas"), Areas=parms.GetStringValue("Areas"),
BuildingNum=parms.GetStringValue("BuildingNum"), BuildingNum=parms.GetStringValue("BuildingNum"),
FloorNum=parms.GetInt("FloorNum"), FloorNum=parms.GetStringValue("FloorNum"),
ElevatorNum=parms.GetInt("ElevatorNum"), ElevatorNum=parms.GetStringValue("ElevatorNum"),
FloorHeight=parms.GetDecimal("FloorHeight"), FloorHeight=parms.GetDecimal("FloorHeight"),
Developers=parms.GetStringValue("Developers"), Developers=parms.GetStringValue("Developers"),
PropertyComp=parms.GetStringValue("PropertyComp"), PropertyComp=parms.GetStringValue("PropertyComp"),
...@@ -202,8 +202,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -202,8 +202,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
CategoryName = extModel?.CategoryName ?? "", CategoryName = extModel?.CategoryName ?? "",
Areas = extModel?.Areas ?? "", Areas = extModel?.Areas ?? "",
BuildingNum = extModel?.BuildingNum ?? "", BuildingNum = extModel?.BuildingNum ?? "",
FloorNum = extModel?.FloorNum ?? 0, FloorNum = extModel?.FloorNum ?? "",
ElevatorNum = extModel?.ElevatorNum ?? 0, ElevatorNum = extModel?.ElevatorNum ?? "",
FloorHeight = extModel?.FloorHeight ?? 0, FloorHeight = extModel?.FloorHeight ?? 0,
Developers = extModel?.Developers ?? "", Developers = extModel?.Developers ?? "",
PropertyComp = extModel?.PropertyComp ?? "", PropertyComp = extModel?.PropertyComp ?? "",
...@@ -539,8 +539,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -539,8 +539,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
Renovation = parms.GetStringValue("Renovation"), Renovation = parms.GetStringValue("Renovation"),
Payment = parms.GetStringValue("Payment"), Payment = parms.GetStringValue("Payment"),
HandoverDate = parms.GetStringValue("HandoverDate"), HandoverDate = parms.GetStringValue("HandoverDate"),
IntentionalFloor = parms.GetInt("IntentionalFloor"), IntentionalFloor = parms.GetStringValue("IntentionalFloor"),
ElevatorNum = parms.GetInt("ElevatorNum"), ElevatorNum = parms.GetStringValue("ElevatorNum"),
PropertyFee = parms.GetDecimal("PropertyFee"), PropertyFee = parms.GetDecimal("PropertyFee"),
RentFee = parms.GetDecimal("RentFee"), RentFee = parms.GetDecimal("RentFee"),
ContactName = parms.GetStringValue("ContactName"), ContactName = parms.GetStringValue("ContactName"),
...@@ -616,8 +616,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -616,8 +616,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
Renovation = extModel?.Renovation ?? "", Renovation = extModel?.Renovation ?? "",
Payment = extModel?.Payment ?? "", Payment = extModel?.Payment ?? "",
HandoverDate = extModel?.HandoverDate ?? "", HandoverDate = extModel?.HandoverDate ?? "",
IntentionalFloor = extModel?.IntentionalFloor ?? 0, IntentionalFloor = extModel?.IntentionalFloor ?? "",
ElevatorNum = extModel?.ElevatorNum ?? 0, ElevatorNum = extModel?.ElevatorNum ?? "",
PropertyFee = extModel?.PropertyFee ?? 0, PropertyFee = extModel?.PropertyFee ?? 0,
RentFee = extModel?.RentFee ?? 0, RentFee = extModel?.RentFee ?? 0,
ContactName = extModel?.ContactName ?? "", ContactName = extModel?.ContactName ?? "",
......
...@@ -2205,11 +2205,12 @@ namespace Mall.WebApi.Controllers.User ...@@ -2205,11 +2205,12 @@ namespace Mall.WebApi.Controllers.User
/// <returns></returns> /// <returns></returns>
public ApiResult TestYBBrandImport() public ApiResult TestYBBrandImport()
{ {
string rootPath = Path.Combine(Directory.GetCurrentDirectory(), "upfile"); //string rootPath = Path.Combine(Directory.GetCurrentDirectory(), "upfile");
string filePath = rootPath+ @"\宜宾模板文件.xlsx"; //string filePath = rootPath+ @"\宜宾模板文件.xlsx";
string tempPath = rootPath + @"\TempImg"; //string tempPath = rootPath + @"\TempImg";
var list = BrandHelper.ImportYBBrandData(filePath, tempPath); //var list = BrandHelper.ImportYBBrandData(filePath, tempPath);
return ApiResult.Success(data: Common.Plugin.JsonHelper.Serialize(list)); //return ApiResult.Success(data: Common.Plugin.JsonHelper.Serialize(list));
return ApiResult.Success();
} }
} }
} }
\ No newline at end of file
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