From b157236768c28e21e1ab6d974973f04383669b8d Mon Sep 17 00:00:00 2001 From: ljw Date: Thu, 5 Sep 2024 22:17:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rf/salescommission/SparepartsNotShippedPlugin.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/yem/rf/salescommission/SparepartsNotShippedPlugin.java b/src/main/java/com/yem/rf/salescommission/SparepartsNotShippedPlugin.java index ca8718ea..7d69ee7e 100644 --- a/src/main/java/com/yem/rf/salescommission/SparepartsNotShippedPlugin.java +++ b/src/main/java/com/yem/rf/salescommission/SparepartsNotShippedPlugin.java @@ -120,11 +120,13 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin { private static DataSet getYemShippingdetails(QFilter qFilter, DataSet yemShippingdetails) { List selectfield = new ArrayList<>(); selectfield.add("yem_receiptdetail.yem_claimdetail.yem_salcontractno.id yem_salcontractnoid");//收款单的合同号id - selectfield.add("TO_CHAR(yem_bizdate, 'yyyy-MM-dd') paymenttime");// + selectfield.add("yem_bizdate paymenttimes");// DataSet yemShippingdetail = ORM.create().queryDataSet(algoKey, "yem_gathering", String.join(",", selectfield), qFilter.toArray()); - yemShippingdetails = yemShippingdetails.leftJoin(yemShippingdetail) - .on("yem_titleid", "yem_salcontractnoid") - .select(RptUtil.getDataSetFiledAlias(yemShippingdetails), RptUtil.getDataSetFiledAlias(yemShippingdetail)) + yemShippingdetail = yemShippingdetail.groupBy(new String[]{"yem_salcontractnoid"}).max("paymenttimes").finish(); + yemShippingdetail = yemShippingdetail.addField("TO_CHAR(paymenttimes, 'yyyy-MM-dd') paymenttime","paymenttime"); + yemShippingdetails = yemShippingdetail.leftJoin(yemShippingdetails) + .on("yem_salcontractnoid", "yem_titleid") + .select(RptUtil.getDataSetFiledAlias(yemShippingdetail), RptUtil.getDataSetFiledAlias(yemShippingdetails)) .finish(); DataSet claimedAmt = queryGathering_ClaimedAmt(); yemShippingdetails = yemShippingdetails.leftJoin(claimedAmt).on("yem_salcontractnoid","salesorderid")