|
|
@@ -796,7 +796,7 @@ namespace Hotline.Api.Controllers
|
|
|
.LeftJoin<Order>((op, p) => p.Id == op.OrderId)
|
|
|
.Where((op, p) => op.PublishState == true)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.FlowCode), (op, p) => p.No == dto.FlowCode)
|
|
|
- .WhereIF(!string.IsNullOrEmpty(dto.FlowName), (op, p) => p.Title.Contains(dto.FlowName))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.FlowName), (op, p) => op.ArrangeTitle.Contains(dto.FlowName))
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.FlowSType), (op, p) => p.AcceptTypeCode == dto.FlowSType)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.FlowRType), (op, p) => p.HotspotId == dto.FlowRType)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.FlowSDate), (op, p) => p.StartTime >= DateTime.Parse(DateTime.Parse(dto.FlowSDate).ToString("yyyy-MM-dd 00:00:00")))//dto.FlowSDate
|
|
|
@@ -809,7 +809,7 @@ namespace Hotline.Api.Controllers
|
|
|
FlowID = p.Id,
|
|
|
FlowCode = p.No,
|
|
|
FlowPwd = p.Password,
|
|
|
- FlowTitle = p.Title,
|
|
|
+ FlowTitle = op.ArrangeTitle,
|
|
|
FlowFromName = p.SourceChannel,
|
|
|
FlowPurTypeName = p.AcceptType,
|
|
|
ConTypeName = p.HotspotName,
|
|
|
@@ -871,7 +871,7 @@ namespace Hotline.Api.Controllers
|
|
|
var (total, items) = await _orderPublishRepository.Queryable()
|
|
|
.LeftJoin<Order>((op, p) => p.Id == op.OrderId)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.FlowCode), (op, p) => p.No == dto.FlowCode)
|
|
|
- .WhereIF(!string.IsNullOrEmpty(dto.FlowName), (op, p) => p.Title.Contains(dto.FlowName))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.FlowName), (op, p) => op.ArrangeTitle.Contains(dto.FlowName))
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.FlowSType), (op, p) => p.AcceptTypeCode == dto.FlowSType)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.FlowRType), (op, p) => p.HotspotId == dto.FlowRType)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.FlowSDate), (op, p) => p.StartTime >= DateTime.Parse(DateTime.Parse(dto.FlowSDate).ToString("yyyy-MM-dd 00:00:00")))//dto.FlowSDate
|
|
|
@@ -884,7 +884,7 @@ namespace Hotline.Api.Controllers
|
|
|
FlowID = p.Id,
|
|
|
FlowCode = p.No,
|
|
|
FlowPwd = p.Password,
|
|
|
- FlowTitle = p.Title,
|
|
|
+ FlowTitle = op.ArrangeTitle,
|
|
|
FlowFromName = p.SourceChannel,
|
|
|
FlowPurTypeName = p.AcceptType,
|
|
|
ConTypeName = p.HotspotName,
|
tangjiang