diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs index 2302937..677e350 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/PayInfoExport.cs @@ -75,15 +75,15 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports 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(Pay_AdvanceDetail)); + var adv = new JoinAlias(typeof(AdvancePay_Detail)); 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.And(DQCondition.EQ(root, "ID", adv, "Pay_ID"), DQCondition.EQ(rel, "Advance_ID", adv, "AdvancePay_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("Farmer_BankAccount", adv, t + "卡号")); query.Columns.Add(DQSelectColumn.Field("Farmer_Name", adv, t + "姓名")); - query.Columns.Add(DQSelectColumn.Field("AdvancePay_Money", adv, t + "金额")); - SumColumnNames.Add("AdvancePay_Money"); + query.Columns.Add(DQSelectColumn.Field("Money", adv, t + "金额")); + SumColumnNames.Add("Money"); query.Where.Conditions.Add(DQCondition.IsNotNull(DQExpression.Field(adv, "ID"))); } else