violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change:销售提成整机

Browse Source
This commit is contained in:
zzs01@yunemao.com 2024-09-05 14:14:17 +08:00
parent d98169b17b
commit 3118ea1501
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/yem/rf/salescommission/SalesCommissionReportPlugin.java
View File

@ -75,6 +75,10 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
long resourceno = filter.getLong("yem_resourceno");//资源号 long resourceno = filter.getLong("yem_resourceno");//资源号
Date start = filter.getDate("yem_ladingdate_start");//提单日期-开始 Date start = filter.getDate("yem_ladingdate_start");//提单日期-开始
Date end = filter.getDate("yem_ladingdate_end");//提单日期-结束 Date end = filter.getDate("yem_ladingdate_end");//提单日期-结束
Date fshipdate_start = filter.getDate("yem_fshipdate_start");
Date fshipdate_end = filter.getDate("yem_fshipdate_end");
where.append("salesorder_billtype IN ('yem_es_salesorder_nmzj', 'yem_es_salesorder_ZJ') AND salesorder_commissiontype IN ('Z', 'ZP')"); where.append("salesorder_billtype IN ('yem_es_salesorder_nmzj', 'yem_es_salesorder_ZJ') AND salesorder_commissiontype IN ('Z', 'ZP')");
if (YEM.isNotEmpty(salesorderno)) { if (YEM.isNotEmpty(salesorderno)) {
where.append(" AND yem_contractno LIKE '%").append(salesorderno).append("%'"); where.append(" AND yem_contractno LIKE '%").append(salesorderno).append("%'");
@ -97,6 +101,15 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
if (YEM.isNotEmpty(end)) { if (YEM.isNotEmpty(end)) {
where.append(" AND TO_DATE(yem_ladingdatetext,'yyyy-MM-dd') <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(end))); where.append(" AND TO_DATE(yem_ladingdatetext,'yyyy-MM-dd') <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(end)));
} }
if (YEM.isNotEmpty(fshipdate_start)) {
where.append(" AND TO_DATE(yem_shipdate,'yyyy-MM-dd') >= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fshipdate_start)));
}
if (YEM.isNotEmpty(fshipdate_end)) {
where.append(" AND TO_DATE(yem_shipdate,'yyyy-MM-dd') >= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fshipdate_end)));
}
resDataSet = resDataSet.where(where.toString()); resDataSet = resDataSet.where(where.toString());
return resDataSet; return resDataSet;
@ -135,6 +148,7 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
selectfields.add("yem_currency yem_currency");//结算币别 selectfields.add("yem_currency yem_currency");//结算币别
selectfields.add("yem_exrate yem_exrate");//汇率 selectfields.add("yem_exrate yem_exrate");//汇率
selectfields.add("createtime"); selectfields.add("createtime");
selectfields.add("TO_CHAR(yem_bizdate, 'yyyy-MM-dd') yem_shipdate");//业务日期-发货日期
return ORM.create().queryDataSet(algoKey, "yem_es_delivernotice", String.join(",", selectfields), qFilter.toArray()) return ORM.create().queryDataSet(algoKey, "yem_es_delivernotice", String.join(",", selectfields), qFilter.toArray())
.orderBy(new String[]{"createtime DESC"}); .orderBy(new String[]{"createtime DESC"});