Merge branch 'fix-report-zzs' into test

2024-09-06 15:34:52 +08:00 · 2024-09-06 15:34:52 +08:00 · 752f50ebc3
commit 752f50ebc3
parent 5a31c48ff2 51d8af6a7d
1 changed files with 3 additions and 0 deletions
--- a/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java
+++ b/src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java
@ -81,6 +81,9 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin

        dataSet = dataSet.where(sb.toString());

+        dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," +
+                "CASE WHEN yem_dnbillno IS NOT NULL AND yem_dnbillno != '' THEN '是' ELSE '否' END yem_isshiped");
+
        return dataSet;
    }