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-05 11:26:30 +08:00
parent afc3b08ce2
commit 8a571e614a
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/yem/rf/salescommission/ExportDeclarationDetailsReportPlugin.java
View File

@ -450,18 +450,20 @@ public class ExportDeclarationDetailsReportPlugin extends AbstractReportListData
"ELSE 0.0 " + "ELSE 0.0 " +
"END contains_framework_sign "); "END contains_framework_sign ");
DataSet framework = dataSet.copy().where("contains_framework_sign = 1.0"); dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," +
"CASE WHEN contains_framework_sign = 1 THEN contact_billno ELSE '' END yem_orderno");
framework = framework.groupBy(new String[]{"framework_billno"}) // DataSet framework = dataSet.copy().where("contains_framework_sign = 1.0");
.agg(new GroupConcatFunctionByComma(), "contact_billno", "yem_orderno") //
.finish(); // framework = framework.groupBy(new String[]{"framework_billno"})
// .agg(new GroupConcatFunctionByComma(), "contact_billno", "yem_orderno")
framework = framework.select("framework_billno framework_billno_fk, yem_orderno"); // .finish();
//
dataSet = dataSet.leftJoin(framework) // framework = framework.select("framework_billno framework_billno_fk, yem_orderno");
.on("framework_billno", "framework_billno_fk") //
.select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(framework)) // dataSet = dataSet.leftJoin(framework)
.finish(); // .on("framework_billno", "framework_billno_fk")
// .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(framework))
// .finish();
return dataSet; return dataSet;
} }