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

fix:销售提成整机，首付款支付日为空

Browse Source
This commit is contained in:
zzs01@yunemao.com 2024-09-02 11:14:27 +08:00
parent cdd324831f
commit c1701969f7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,8 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
.on("salesorderid", "main_id_g_claimed_amt_fk")
.select(RptUtil.getDataSetFiledAlias(resDataSet), RptUtil.getDataSetFiledAlias(claimedAmt))
.finish();
claimDate = claimDate.select("main_id_gathering_fk, yem_prodpaydate yem_firstpaydate, yem_endpaydate yem_lastpaydate");
claimDate = claimDate.select("main_id_gathering_fk, yem_endpaydate yem_lastpaydate, " +
"CASE WHEN yem_prodpaydate != '' THEN yem_prodpaydate ELSE yem_shippaydate END yem_firstpaydate");
resDataSet = resDataSet.leftJoin(claimDate)
.on("salesorderid", "main_id_gathering_fk")
.select(RptUtil.getDataSetFiledAlias(resDataSet), RptUtil.getDataSetFiledAlias(claimDate))