From b780d577faa6b02731b051fc3f38922b59008500 Mon Sep 17 00:00:00 2001
From: 25655 <2565550274@qq.com>
Date: Thu, 20 Mar 2025 15:38:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=201.=E9=85=8D=E4=BB=B6=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E6=98=8E=E7=BB=86=E8=A1=A8=EF=BC=88=E5=B7=B2=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=EF=BC=89=E5=BC=80=E7=A5=A8=E6=97=A5=E6=9C=9F=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=89=E5=A4=9A=E5=BC=A0=E6=8A=A5=E5=85=B3?=
 =?UTF-8?q?=E5=8D=95=E5=88=99=E5=8F=96=E6=9C=80=E6=97=A9=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rf/salescommission/SparepartsPlugin.java  | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java b/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java
index e51c13ae..d943a07f 100644
--- a/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java
+++ b/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java
@@ -13,6 +13,7 @@ import kd.bos.entity.report.ReportQueryParam;
 import kd.bos.orm.ORM;
 import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
+import kd.bos.servicehelper.BusinessDataServiceHelper;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -64,7 +65,7 @@ public class SparepartsPlugin extends AbstractReportListDataPlugin {
                 .finish();
         //订舱通知关联出口报关
         resDataSet = resDataSet.leftJoin(yemEsDeclaredocx)
-                .on("yemContainernumberid", "yemEsDeclaredocxyem_sourcebillid")
+                .on("yemContainernumberyem_sourcebillid", "yem_corebilliddx")
                 .select(RptUtil.getDataSetFiledAlias(resDataSet), RptUtil.getDataSetFiledAlias(yemEsDeclaredocx))
                 .finish();
         resDataSet = resDataSet.leftJoin(yemGathering)
@@ -354,10 +355,30 @@ public class SparepartsPlugin extends AbstractReportListDataPlugin {
      */
     private DataSet yemEsDeclaredocx() {
         QFilter qFilter = getBaseQFilter();
+        DynamicObject[] dynamicObjects = BusinessDataServiceHelper.load("yem_es_declaredocx", "id,billno,yem_invoicedate,yem_corebillid"
+                , new QFilter[]{new QFilter("yem_invoicedate", QCP.not_equals, null)});
+        Map<Long,Date> map = new HashMap();
+        List<Long> id = new ArrayList<>();
+        for (DynamicObject dynamicObject : dynamicObjects) {
+            long yemSourcebillid = dynamicObject.getLong("yem_corebillid");
+            Date yemInvoicedate = dynamicObject.getDate("yem_invoicedate");
+            if (map.get(yemSourcebillid)==null) {
+                map.put(yemSourcebillid, yemInvoicedate);
+            }else {
+                if (!map.get(yemSourcebillid).before(yemInvoicedate)) {
+                    map.put(yemSourcebillid, yemInvoicedate);
+                }
+            }
+        }
+        Set<Long> longs = map.keySet();
+        qFilter.and("yem_corebillid",QCP.in,longs);
         List<String> selectfields = new ArrayList<>();
+        selectfields.add("yem_corebillid yem_corebilliddx");
         selectfields.add("TO_CHAR(yem_invoicedate, 'yyyy-MM-dd') yem_invoicingdate");//开票日期
-        selectfields.add("yem_sourcebillid yemEsDeclaredocxyem_sourcebillid");
+//        selectfields.add("yem_sourcebillid yemEsDeclaredocxyem_sourcebillid");
         DataSet yemShippingdetails = ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray());
+//        yemShippingdetails = yemShippingdetails.groupBy(new String[]{"yemEsDeclaredocxyem_sourcebillid"}).finish();
+//        yemShippingdetails = yemShippingdetails.removeFields("yem_corebillid");
         return yemShippingdetails;
     }