|
|
|
@ -59,10 +59,31 @@ namespace Myshipping.Application
|
|
|
|
|
public async Task<dynamic> Page([FromQuery] QueryBookingTemplateInput input)
|
|
|
|
|
{
|
|
|
|
|
var entities = await _rep.AsQueryable()
|
|
|
|
|
.Where(m => m.CreatedUserId == UserManager.UserId)
|
|
|
|
|
.WhereIF(!string.IsNullOrEmpty(input.Title), u => u.Title.Contains(input.Title))
|
|
|
|
|
.WhereIF(!string.IsNullOrEmpty(input.Type), u => u.Type.Contains(input.Type))
|
|
|
|
|
.Where(x => x.CreatedUserId == UserManager.UserId)
|
|
|
|
|
.WhereIF(!string.IsNullOrEmpty(input.Title), x => x.Title.Contains(input.Title))
|
|
|
|
|
.WhereIF(!string.IsNullOrEmpty(input.Type), x => x.Type.Contains(input.Type))
|
|
|
|
|
.Select(x => new QueryBookingTemplateOutput()
|
|
|
|
|
{
|
|
|
|
|
Id = x.Id,
|
|
|
|
|
Title = x.Title,
|
|
|
|
|
Type = x.Type,
|
|
|
|
|
Content = x.Content,
|
|
|
|
|
Remark = x.Remark,
|
|
|
|
|
ADDR = x.ADDR,
|
|
|
|
|
COUNTRY = x.COUNTRY,
|
|
|
|
|
COUNTRYName = x.COUNTRYName,
|
|
|
|
|
TEL = x.TEL
|
|
|
|
|
})
|
|
|
|
|
.ToPagedListAsync(input.PageNo, input.PageSize);
|
|
|
|
|
|
|
|
|
|
//分享标志
|
|
|
|
|
var tempIdList = entities.Items.Select(x => x.Id).ToList();
|
|
|
|
|
var shareList = _repPrintTemplateShare.AsQueryable().Where(x => tempIdList.Contains(x.TemplateId)).ToList();
|
|
|
|
|
foreach (var item in entities.Items)
|
|
|
|
|
{
|
|
|
|
|
item.IsShared = shareList.Count(x => x.TemplateId == item.Id) > 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return entities.XnPagedResult();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -135,7 +156,8 @@ namespace Myshipping.Application
|
|
|
|
|
[HttpPost("/BookingTemplate/SaveTemplateShare")]
|
|
|
|
|
public async Task SaveTemplateShare(List<BookingTemplateShareDto> dto)
|
|
|
|
|
{
|
|
|
|
|
if (dto==null|| dto.Count==0) {
|
|
|
|
|
if (dto == null || dto.Count == 0)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
throw Oops.Oh("请上传正确数据");
|
|
|
|
|
}
|
|
|
|
@ -148,7 +170,31 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 分享模板给所有人
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="tempId"></param>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpPost("/BookingTemplate/ShareToAll")]
|
|
|
|
|
public async Task ShareTemplate(long tempId)
|
|
|
|
|
{
|
|
|
|
|
var bts = new BookingTemplateShare();
|
|
|
|
|
bts.TemplateId = tempId;
|
|
|
|
|
bts.ShareToId = -1;
|
|
|
|
|
bts.ShareToName = "所有人";
|
|
|
|
|
await _repPrintTemplateShare.InsertAsync(bts);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 取消分享模板
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="tempId"></param>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpPost("/BookingTemplate/CancelShare")]
|
|
|
|
|
public async Task CancelShareTemplate(long tempId)
|
|
|
|
|
{
|
|
|
|
|
_repPrintTemplateShare.Delete(x => x.TemplateId == tempId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 获取分享列表
|
|
|
|
@ -194,11 +240,11 @@ namespace Myshipping.Application
|
|
|
|
|
[HttpGet("/BookingTemplate/GetTemplateShare")]
|
|
|
|
|
public async Task<dynamic> GetTemplateShare(string TemplateName, string Type)
|
|
|
|
|
{
|
|
|
|
|
var TemplateIds=_repPrintTemplateShare.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.ShareToId == UserManager.UserId).Select(x => x.TemplateId).ToList();
|
|
|
|
|
var TemplateIds = _repPrintTemplateShare.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && (x.ShareToId == UserManager.UserId || x.ShareToId == -1)).Select(x => x.TemplateId).ToList();
|
|
|
|
|
|
|
|
|
|
var list = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && (TemplateIds.Contains(x.Id) || x.CreatedUserId == UserManager.UserId)).
|
|
|
|
|
WhereIF(!string.IsNullOrEmpty(TemplateName), x => x.Title.Contains(TemplateName)).
|
|
|
|
|
WhereIF(!string.IsNullOrEmpty(Type), x => x.Type.Contains(Type)).ToListAsync();
|
|
|
|
|
WhereIF(!string.IsNullOrEmpty(Type), x => x.Type.Contains(Type)).Distinct().ToListAsync();
|
|
|
|
|
|
|
|
|
|
return list;
|
|
|
|
|
}
|
|
|
|
|