|
|
@ -74,19 +74,14 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports |
|
|
if (!payTarget.Value.Value) |
|
|
if (!payTarget.Value.Value) |
|
|
{ |
|
|
{ |
|
|
var root = query.From.RootSource.Alias; |
|
|
var root = query.From.RootSource.Alias; |
|
|
var detail = new JoinAlias(typeof(Pay_Detail)); |
|
|
|
|
|
var rel = new JoinAlias(typeof(Pay_Advance_Relate)); |
|
|
|
|
|
var adv = new JoinAlias(typeof(AdvancePay_Detail)); |
|
|
|
|
|
|
|
|
var detail = new JoinAlias(typeof(Pay_FarmerDetail)); |
|
|
query.From.AddJoin(JoinType.Left, new DQDmoSource(detail), DQCondition.EQ(root, "ID", detail, "Pay_ID")); |
|
|
query.From.AddJoin(JoinType.Left, new DQDmoSource(detail), DQCondition.EQ(root, "ID", detail, "Pay_ID")); |
|
|
query.From.AddJoin(JoinType.Left, new DQDmoSource(rel), DQCondition.EQ(detail, "ID", rel, "Pay_Detail_ID")); |
|
|
|
|
|
query.From.AddJoin(JoinType.Left, new DQDmoSource(adv), DQCondition.EQ(rel, "AdvancePay_Detail_ID", adv, "ID")); |
|
|
|
|
|
query.Columns.Add(DQSelectColumn.Field("ID", root, t + "付款单号")); |
|
|
query.Columns.Add(DQSelectColumn.Field("ID", root, t + "付款单号")); |
|
|
query.Columns.Add(DQSelectColumn.Field("Farmer_Bank", adv, t + "开户银行")); |
|
|
|
|
|
query.Columns.Add(DQSelectColumn.Field("Farmer_BankAccount", adv, t + "卡号")); |
|
|
|
|
|
query.Columns.Add(DQSelectColumn.Field("Farmer_Name", adv, t + "姓名")); |
|
|
|
|
|
query.Columns.Add(DQSelectColumn.Field("Money", adv, t + "金额")); |
|
|
|
|
|
|
|
|
query.Columns.Add(DQSelectColumn.Field("Farmer_Bank", detail, t + "开户银行")); |
|
|
|
|
|
query.Columns.Add(DQSelectColumn.Field("Farmer_BankAccount", detail, t + "卡号")); |
|
|
|
|
|
query.Columns.Add(DQSelectColumn.Field("Farmer_Name", detail, t + "姓名")); |
|
|
|
|
|
query.Columns.Add(DQSelectColumn.Field("Money", detail, t + "金额")); |
|
|
SumColumnNames.Add("Money"); |
|
|
SumColumnNames.Add("Money"); |
|
|
query.Where.Conditions.Add(DQCondition.IsNotNull(DQExpression.Field(adv, "ID"))); |
|
|
|
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
|