Skip to content

M
mall.oytour.com
Commit 465c1aa3 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 59bcd812
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 319 additions and 101 deletions
Mall.Common/Enum/TradePavilion/BusinessExportEnum.cs
View file @ 465c1aa3
......@@ -25,105 +25,107 @@ namespace Mall.Common.Enum.TradePavilion
/// </summary>
[EnumField("品牌名")]
BrandName = 3,
/// <summary>
/// Logo
/// </summary>
[EnumField("Logo")]
Logo = 4,
/// <summary>
/// 品牌视频
/// </summary>
[EnumField("品牌视频")]
VideoUrl = 4,
VideoUrl = 5,
/// <summary>
/// 店铺数量
/// </summary>
[EnumField("店铺数量")]
ShopNum = 5,
ShopNum = 6,
/// <summary>
/// 建筑面积
/// </summary>
[EnumField("建筑面积")]
BuiltUpArea = 6,
BuiltUpArea = 7,
/// <summary>
/// 需求面积
/// </summary>
[EnumField("需求面积")]
AreaRequirement = 7,
AreaRequirement = 8,
/// <summary>
/// 客群定位
/// </summary>
[EnumField("客群定位")]
CustomerType = 8,
CustomerType = 9,
/// <summary>
/// 品牌定位
/// </summary>
[EnumField("品牌定位")]
BrandType = 9,
BrandType = 10,
/// <summary>
/// 拓店区域
/// </summary>
[EnumField("拓店区域")]
StoreExpansion = 10,
StoreExpansion = 11,
/// <summary>
/// 商铺性质
/// </summary>
[EnumField("商铺性质")]
ProjectType = 11,
ProjectType = 12,
/// <summary>
/// 店铺开口尺寸
/// </summary>
[EnumField("店铺开口尺寸")]
IsShopSize = 12,
IsShopSize = 13,
/// <summary>
/// 燃气
/// </summary>
[EnumField("燃气")]
RanQi = 13,
RanQi = 14,
/// <summary>
/// 排烟量
/// </summary>
[EnumField("排烟量")]
PaiYan = 14,
PaiYan = 15,
/// <summary>
/// 电量
/// </summary>
[EnumField("电量")]
IsDianLiang = 15,
IsDianLiang = 16,
/// <summary>
/// 上下水
/// </summary>
[EnumField("上下水")]
Plumbing = 16,
Plumbing = 17,
/// <summary>
/// 管径
/// </summary>
[EnumField("管径")]
Caliber = 17,
Caliber = 18,
/// <summary>
/// 排污
/// </summary>
[EnumField("排污")]
Sewage = 18,
Sewage = 19,
/// <summary>
/// 空调
/// </summary>
[EnumField("空调")]
KongTiao = 19,
KongTiao = 20,
/// <summary>
/// 新风
/// </summary>
[EnumField("新风")]
XinFeng = 20,
XinFeng = 21,
/// <summary>
/// 广告
/// </summary>
[EnumField("广告")]
Advertising = 21,
Advertising = 22,
/// <summary>
/// 其他
/// </summary>
[EnumField("其他")]
Other = 22,
/// <summary>
/// Logo
/// </summary>
[EnumField("Logo")]
Logo = 23,
Other = 23,
}
}
Mall.Common/Enum/TradePavilion/CarrierExportEnum.cs 0 → 100644
View file @ 465c1aa3
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Common.Plugin;
namespace Mall.Common.Enum.TradePavilion
{
public enum CarrierExportEnum
{
/// <summary>
/// 项目名称
/// </summary>
[EnumField("项目名称")]
CarrierName = 1,
/// <summary>
/// Logo
/// </summary>
[EnumField("Logo")]
Logo = 2,
/// <summary>
/// 开发商
/// </summary>
[EnumField("开发商")]
Developers = 3,
/// <summary>
/// 载体视频
/// </summary>
[EnumField("载体视频")]
VideoUrl = 4,
/// <summary>
/// 项目地址
/// </summary>
[EnumField("项目地址")]
Address = 5,
/// <summary>
/// 开业时间
/// </summary>
[EnumField("开业时间")]
OpenTime = 6,
/// <summary>
/// 项目类型
/// </summary>
[EnumField("项目类型")]
ProjectType = 7,
/// <summary>
/// 商业体量
/// </summary>
[EnumField("商业体量")]
CarrierSize = 8,
/// <summary>
/// 商业层数
/// </summary>
[EnumField("商业层数")]
LayersNum = 9,
/// <summary>
/// 车位数量
/// </summary>
[EnumField("车位数量")]
CarNum = 10,
/// <summary>
/// 业态规则
/// </summary>
[EnumField("业态规则")]
CarrierPlan = 11,
/// <summary>
/// 招引目标
/// </summary>
[EnumField("招引目标")]
CarrierTarget = 12,
/// <summary>
/// 总体定位
/// </summary>
[EnumField("总体定位")]
Location = 13,
/// <summary>
/// 目标人群
/// </summary>
[EnumField("目标人群")]
Crowd = 14,
/// <summary>
/// 地铁信息
/// </summary>
[EnumField("地铁信息")]
CarrierMetro = 15,
}
}
Mall.Common/Plugin/ExcelTempLateHelper.cs
View file @ 465c1aa3
......@@ -278,8 +278,6 @@ namespace Mall.Common.Plugin
{
HSSFPatriarch patriarch = (HSSFPatriarch)sheet.CreateDrawingPatriarch();
try
{
Uri uri = new Uri(subItem.Value); //imgPath :网络图片地址
......@@ -291,33 +289,22 @@ namespace Mall.Common.Plugin
using (MemoryStream ms = new MemoryStream())
{
bitmap.Save(ms, System.Drawing.Imaging.ImageFormat.Jpeg);
bytes = ms.ToArray();
bytes = ms.ToArray();
}
}
int pictureIdx = workbook.AddPicture(bytes, PictureType.JPEG);
// byte[] bytes = System.IO.File.ReadAllBytes(subItem.Value);
// int pictureIdx = workbook.AddPicture(bytes, PictureType.JPEG);
// 插图片的位置 HSSFClientAnchor（dx1,dy1,dx2,dy2,col1,row1,col2,row2) 后面再作解释
HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, columnsIndex, rowIndex, columnsIndex + 1, rowIndex + 1);
//把图片插到相应的位置
HSSFPicture pict = (HSSFPicture)patriarch.CreatePicture(anchor, pictureIdx);
}
finally
}
catch (Exception ex)
{
// 释放资源
//if (responseStream != null) responseStream.Close();
//if (response != null) { response.Close(); response.Dispose(); }
//if (request != null) { request.Abort(); }
}
// SetPic(workbook, patriarch, subItem.Value, sheet, rowIndex, columnsIndex);
columnsIndex++;
}
else
{
......@@ -472,39 +459,6 @@ namespace Mall.Common.Plugin
}
private static void SetPic(HSSFWorkbook workbook, HSSFPatriarch patriarch, string path, ISheet sheet, int rowline, int col)
{
try
{
if (string.IsNullOrEmpty(path)) return;
System.Net.WebRequest request = System.Net.WebRequest.Create(path);
System.Net.WebResponse response = request.GetResponse();
Stream responseStream = response.GetResponseStream();
int buffersize = 1024;
byte[] buffer = new byte[buffersize];
int count = responseStream.Read(buffer, 0, buffersize);
while (count > 0)
{
count = responseStream.Read(buffer, 0, buffersize);
}
int pictureIdx = workbook.AddPicture(buffer, PictureType.JPEG);
// byte[] bytes = System.IO.File.ReadAllBytes(path);
// int pictureIdx = workbook.AddPicture(bytes, PictureType.JPEG);
// 插图片的位置 HSSFClientAnchor（dx1,dy1,dx2,dy2,col1,row1,col2,row2) 后面再作解释
HSSFClientAnchor anchor = new HSSFClientAnchor(70, 10, 0, 0, col, rowline, col + 1, rowline + 1);
//把图片插到相应的位置
HSSFPicture pict = (HSSFPicture)patriarch.CreatePicture(anchor, pictureIdx);
}
catch (System.Exception ex)
{
return;
}
}
#region [颜色：16进制转成RGB]
/// <summary>
......
Mall.Model/Extend/TradePavilion/RB_Carrier_Extend.cs
View file @ 465c1aa3
......@@ -46,5 +46,10 @@ namespace Mall.Model.Extend.TradePavilion
/// 收藏id
/// </summary>
public int CollectId { get; set; }
/// <summary>
/// 导出选中的字段
/// </summary>
public List<int> ExcelEnumIds { get; set; }
}
}
Mall.Repository/TradePavilion/RB_CarrierRepository.cs
View file @ 465c1aa3
......@@ -121,6 +121,15 @@ namespace Mall.Repository.TradePavilion
{
builder.Append($" AND {nameof(RB_Carrier_Extend.Developers)} like '%{query.Developers}%'");
}
if (!string.IsNullOrWhiteSpace(query.StartOpenTime))
{
builder.Append($" and DATE_FORMAT({nameof(RB_Carrier_Extend.OpenTime)},'%Y-%m-%d' )>=DATE_FORMAT('{query.StartOpenTime}','%Y-%m-%d' ) ");
}
if (!string.IsNullOrWhiteSpace(query.EndOpenTime))
{
builder.Append($" and DATE_FORMAT({nameof(RB_Carrier_Extend.OpenTime)},'%Y-%m-%d' )<= DATE_FORMAT('{query.EndOpenTime}','%Y-%m-%d' ) ");
}
if (query.MetroNum > 0 || !string.IsNullOrWhiteSpace(query.MetroName))
{
builder.Append($" AND {nameof(RB_Carrier_Extend.ID)} in (SELECT CarrierId from rb_carriermetro where `Status`=0 ");
......@@ -134,6 +143,14 @@ namespace Mall.Repository.TradePavilion
}
builder.Append(" )");
}
if (query.OrderBy == 1)
{
builder.Append($" order by {nameof(RB_Carrier_Extend.CreateDate)} desc");
}
else if (query.OrderBy == 2)
{
builder.Append($" order by {nameof(RB_Carrier_Extend.OpenTime)} desc");
}
}
return Get<RB_Carrier_Extend>(builder.ToString()).ToList();
}
......
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