From 19c58d6a6d352f45d5c096689a3d6b6eca64addd Mon Sep 17 00:00:00 2001
From: zzs <hi@vio.vin>
Date: Mon, 16 Dec 2024 10:03:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AF=84=E5=8D=95=E6=94=BE=E5=8D=95?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=8F=90=E4=BA=A4=E6=94=B6=E6=AC=BE=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B9=E4=B8=BA=E6=94=B9=E6=88=90=E5=BA=94=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E6=97=A5=E6=9C=9F1=E5=B0=8F=E4=BA=8E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExportPresentSubmitsValidator.java        | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitsValidator.java b/src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitsValidator.java
index ef1760f8..bf58ba20 100644
--- a/src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitsValidator.java
+++ b/src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitsValidator.java
@@ -1,6 +1,7 @@
 package com.yem.wm.es.exportpresent.validator;
 
 import com.yem.wm.utils.DynamicObjectUtil;
+import com.yem.wm.utils.YEM;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.entity.ExtendedDataEntity;
@@ -11,6 +12,7 @@ import kd.bos.servicehelper.BusinessDataServiceHelper;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,28 +23,27 @@ import java.util.List;
 public class ExportPresentSubmitsValidator extends AbstractValidator {
 
     @Override
-    public void validate()
-    {
+    public void validate() {
         ExtendedDataEntity[] dataEntities = this.getDataEntities();
         for (ExtendedDataEntity data : dataEntities) {
             DynamicObject dataEntity = data.getDataEntity();
             // 款项类型
             String paymenttype = dataEntity.getString("yem_paymenttype");
             if ("A".equals(paymenttype)) {
-                arrearsVerification(dataEntity,data);
+                arrearsVerification(dataEntity, data);
             }
         }
     }
 
-    private void arrearsVerification(DynamicObject dataEntity,ExtendedDataEntity data) {
+    private void arrearsVerification(DynamicObject dataEntity, ExtendedDataEntity data) {
         DynamicObject yemCustomer = dataEntity.getDynamicObject("yem_customer");
-        if (yemCustomer!=null){
+        if (yemCustomer != null) {
             long aLong = yemCustomer.getLong("id");
             String selectfield = DynamicObjectUtil.getSelectfields("yem_es_storagetrans_xbs", false);
             String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_es_storagetrans_xbs", "yem_creditdetail", false);
             DynamicObject[] load = BusinessDataServiceHelper.load("yem_es_storagetrans_xbs", selectfields
                     , new QFilter[]{new QFilter("yem_customer.id", QCP.equals, aLong)});
-            if (load.length>0){
+            if (load.length > 0) {
                 List<String> list = new ArrayList<>();
                 for (DynamicObject dynamicObject : load) {
                     DynamicObjectCollection yemCreditdetail = dynamicObject.getDynamicObjectCollection("yem_creditdetail");
@@ -51,17 +52,18 @@ public class ExportPresentSubmitsValidator extends AbstractValidator {
                         BigDecimal yemCountpayback = object.getBigDecimal("yem_countpayback");
                         BigDecimal yemActualsinkamtCd = object.getBigDecimal("yem_actualsinkamt_cd");
                         BigDecimal yemPaymentamt1Cd = object.getBigDecimal("yem_paymentamt1_cd");
-                        if (yemCountpayback.compareTo(BigDecimal.ZERO)<0&&yemActualsinkamtCd.compareTo(yemPaymentamt1Cd)<0){
+                        Date paydate1 = object.getDate("yem_paydate1");//应收款日期1
+                        if (YEM.isNotEmpty(paydate1) && paydate1.before(new Date()) && yemActualsinkamtCd.compareTo(yemPaymentamt1Cd) < 0) {
                             DynamicObject yemSalecontractno = object.getDynamicObject("yem_salecontractno");
-                            if (yemSalecontractno!=null){
-                                String  billno = yemSalecontractno.getString("billno");
-                                list.add("当前寄单放单客户存在历史合同：["+billno+"]，订舱通知单：["+dynamicObjectString+"]，逾期未收款，请确认！！！\n");
+                            if (yemSalecontractno != null) {
+                                String billno = yemSalecontractno.getString("billno");
+                                list.add("当前寄单放单客户存在历史合同：[" + billno + "]，订舱通知单：[" + dynamicObjectString + "]，逾期未收款，请确认！！！\n");
 
                             }
                         }
                     }
                 }
-                if (list.size()>0){
+                if (list.size() > 0) {
                     this.addMessage(data, list.toString());
                 }
             }