From 64b0dcc2b34afcb8b8138bd46a4fa7cc68f9664a Mon Sep 17 00:00:00 2001 From: zzs Date: Tue, 14 Jan 2025 15:01:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=A1=E4=BF=9D=E9=A2=9D=E5=BA=A6?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=87=8D=E5=A4=8D=E5=88=A4=E6=96=AD=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=97=A5=E6=9C=9F=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validator/CsrCreditSubmitLineValidator.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/yem/wm/im/csrCreditLine/validator/CsrCreditSubmitLineValidator.java b/src/main/java/com/yem/wm/im/csrCreditLine/validator/CsrCreditSubmitLineValidator.java index d833426b..f3cf3d33 100644 --- a/src/main/java/com/yem/wm/im/csrCreditLine/validator/CsrCreditSubmitLineValidator.java +++ b/src/main/java/com/yem/wm/im/csrCreditLine/validator/CsrCreditSubmitLineValidator.java @@ -28,8 +28,8 @@ public class CsrCreditSubmitLineValidator extends AbstractValidator { // DynamicObject org = dataEntity.getDynamicObject("org"); Date bizDate = dataEntity.getDate("yem_bizdate"); String swiftcode = dataEntity.getString("yem_swiftcode"); - Date yearBegin = getYearBegin(bizDate); - Date yearLast = getYearLast(bizDate); +// Date yearBegin = getYearBegin(bizDate); +// Date yearLast = getYearLast(bizDate); if (!customer.containsProperty("yem_customer")) { customer = BusinessDataServiceHelper.loadSingleFromCache(customer.getPkValue(), customer.getDynamicObjectType().getName()); @@ -37,8 +37,8 @@ public class CsrCreditSubmitLineValidator extends AbstractValidator { QFilter qFilter = new QFilter("yem_customer.yem_customer", QCP.equals, customer.getString("yem_customer")); // QFilter qFilter = new QFilter("yem_customer", QCP.equals, customer.getPkValue()); // qFilter.and(new QFilter("org", QCP.equals, org.getPkValue())); - qFilter.and(new QFilter("yem_bizdate", QCP.large_than, yearBegin)); - qFilter.and(new QFilter("yem_bizdate", QCP.less_equals, yearLast)); +// qFilter.and(new QFilter("yem_bizdate", QCP.large_than, yearBegin)); +// qFilter.and(new QFilter("yem_bizdate", QCP.less_equals, yearLast)); qFilter.and(new QFilter("billstatus", QCP.in, new String[]{"B", "C"})); qFilter.and(new QFilter("yem_payment.id", QCP.equals, method.getLong("id"))); if ("信用证 O/A".contains(method.getString("name"))) { @@ -47,9 +47,9 @@ public class CsrCreditSubmitLineValidator extends AbstractValidator { DynamicObject[] objs = BusinessDataServiceHelper.load(dataEntity.getDynamicObjectType().getName(), "id", qFilter.toArray()); if (objs.length > 0) { if ("信用证 O/A".contains(method.getString("name"))) { - this.addErrorMessage(dataEntitie, "同一年内，相同客户+支付方式+SWIFT CODE，已存在一个客户信保额度申请单，请检查数据！"); + this.addErrorMessage(dataEntitie, "相同客户+支付方式+SWIFT CODE，已存在一个客户信保额度申请单，请检查数据！"); } else { - this.addErrorMessage(dataEntitie, "同一年内，相同客户+支付方式，已存在一个客户信保额度申请单，请检查数据！"); + this.addErrorMessage(dataEntitie, "相同客户+支付方式，已存在一个客户信保额度申请单，请检查数据！"); } } }