msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kpi fix

Browse Source
master
james.zhao 5 years ago
parent 3ea6fdd4ba
commit c713b17447
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.1.2</jib-maven-plugin.version> <jib-maven-plugin.version>1.1.2</jib-maven-plugin.version>
<docker-image.version>1.1.6</docker-image.version> <docker-image.version>1.1.7</docker-image.version>
</properties> </properties>
<dependencies> <dependencies>

6
src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java
Unescape View File

@ -55,7 +55,7 @@ public interface FinancialBDPrizeLogMapper {
"\tsc.org_id = 1 \n" + "\tsc.org_id = 1 \n" +
"\tAND o.date >= #{start_date} \n" + "\tAND o.date >= #{start_date} \n" +
"\tAND o.date < #{end_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" + "\t) \n" +
"\tAND c.get_prize = 1 \n" + "\tAND c.get_prize = 1 \n" +
"\tAND c.manager_id = #{manager_id}") "\tAND c.manager_id = #{manager_id}")
@ -103,7 +103,7 @@ public interface FinancialBDPrizeLogMapper {
"\tsc.org_id = 1 \n" + "\tsc.org_id = 1 \n" +
"\tAND o.date >= #{start_date} \n" + "\tAND o.date >= #{start_date} \n" +
"\tAND o.date < #{end_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" + "\t) \n" +
"\tAND c.bd_group IS NOT NULL \n" + "\tAND c.bd_group IS NOT NULL \n" +
"GROUP BY\n" + "GROUP BY\n" +
@ -131,6 +131,7 @@ public interface FinancialBDPrizeLogMapper {
"\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.end_date IS NULL OR d.end_date > o.date \n" +
"\t) \n" + "\t) \n" +
"\tAND c.bd_group IS NOT NULL \n" + "\tAND c.bd_group IS NOT NULL \n" +
"\tAND fbc.bd_type in (1, 2, 6, 7) \n" +
"GROUP BY\n" + "GROUP BY\n" +
"\tfbc.bd_type \n" + "\tfbc.bd_type \n" +
"\t) t1\n" + "\t) t1\n" +
@ -151,6 +152,7 @@ public interface FinancialBDPrizeLogMapper {
"\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.end_date IS NULL OR d.end_date > o.date \n" +
"\t) \n" + "\t) \n" +
"\tAND c.bd_group IS NOT NULL \n" + "\tAND c.bd_group IS NOT NULL \n" +
"\tAND fbc.bd_type in (1, 2, 6, 7) \n" +
"GROUP BY\n" + "GROUP BY\n" +
"\tfbc.bd_type \n" + "\tfbc.bd_type \n" +
"\t) t2 ON t1.bd_group = t2.bd_group") "\t) t2 ON t1.bd_group = t2.bd_group")

Write Preview
Loading…
Cancel
Save