|
|
|
@ -128,7 +128,7 @@ public interface FinancialBDPrizeLogMapper {
|
|
|
|
|
"\tsc.org_id = 1 \n" +
|
|
|
|
|
"\tAND o.date >= #{start_date} \n" +
|
|
|
|
|
"\tAND o.date < #{end_date} \n" +
|
|
|
|
|
"\tAND d.start_date <= o.date AND ( d.end_date IS NULL OR d.end_date > o.date \n" +
|
|
|
|
|
"\tAND d.start_date <= o.date AND d.is_valid = 1 AND ( d.end_date IS NULL OR d.end_date > o.date \n" +
|
|
|
|
|
"\t) \n" +
|
|
|
|
|
"\tAND c.bd_group IS NOT NULL \n" +
|
|
|
|
|
"\tAND fbc.bd_type in (1, 2, 6, 7) \n" +
|
|
|
|
@ -149,7 +149,7 @@ public interface FinancialBDPrizeLogMapper {
|
|
|
|
|
"\tsc.org_id = 1 \n" +
|
|
|
|
|
"\tAND o.date >= #{month_start_date} \n" +
|
|
|
|
|
"\tAND o.date < #{end_date} \n" +
|
|
|
|
|
"\tAND d.start_date <= o.date AND ( d.end_date IS NULL OR d.end_date > o.date \n" +
|
|
|
|
|
"\tAND d.start_date <= o.date AND d.is_valid = 1 AND ( d.end_date IS NULL OR d.end_date > o.date \n" +
|
|
|
|
|
"\t) \n" +
|
|
|
|
|
"\tAND c.bd_group IS NOT NULL \n" +
|
|
|
|
|
"\tAND fbc.bd_type in (1, 2, 6, 7) \n" +
|
|
|
|
|