diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyLoanBillSubValidatorOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyLoanBillSubValidatorOp.java index 77febd5..ceb9f9f 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyLoanBillSubValidatorOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyLoanBillSubValidatorOp.java @@ -54,17 +54,22 @@ public class DailyLoanBillSubValidatorOp extends AbstractOperationServicePlugIn if (OrgCheckUtils.isKS(companyId)) { String impRestType = er_dailyLoanBill.getString("zcgj_impresttype");//备用金类型 DynamicObject applier = er_dailyLoanBill.getDynamicObject("applier");//申请人 + Date bizDate = er_dailyLoanBill.getDate("bizdate");//申请日期 + LocalDate localDate = bizDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + String bizDateYear = String.valueOf(localDate.getYear());//申请日期年份 if (impRestType != null && !"".equals(impRestType)) { if (impRestType.equals("0")) { //定额备用金 - Date bizDate = er_dailyLoanBill.getDate("bizdate");//申请日期 BigDecimal loanAmount = er_dailyLoanBill.getBigDecimal("loanamount");//借款金额合计 - LocalDate localDate = bizDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - String bizDateYear = String.valueOf(localDate.getYear());//申请日期年份 - QFilter filter = new QFilter("zcgj_entryentity.zcgj_person", QCP.equals, applier.getPkValue()); - filter.and(new QFilter("zcgj_currentyear", QCP.equals, bizDateYear)); - DynamicObject quotaImprestLedger = BusinessDataServiceHelper.loadSingle("zcgj_quotaimprestledger", new QFilter[]{filter});//定额备用金初始台账 + QFilter filter = new QFilter("zcgj_entryentity.zcgj_person", QCP.equals, applier.getPkValue());//可借款人员 + filter.and(new QFilter("zcgj_currentyear", QCP.equals, bizDateYear));//申请日期年份 + DynamicObject quotaImprestLedger = BusinessDataServiceHelper.loadSingle("zcgj_quotaimprestledger", + new QFilter[]{filter});//定额备用金初始台账 + if (quotaImprestLedger == null) { + this.addFatalErrorMessage(dataEnt, "您未在定额备用金初始化台账里!!"); + return; + } DynamicObjectCollection entryEntityCollection = quotaImprestLedger.getDynamicObjectCollection("zcgj_entryentity");//分录 for (DynamicObject entryEntity : entryEntityCollection) { DynamicObject person = entryEntity.getDynamicObject("zcgj_person");//人员 @@ -76,9 +81,17 @@ public class DailyLoanBillSubValidatorOp extends AbstractOperationServicePlugIn } } } - }/* else if (impRestType.equals("1")) { + } else if (impRestType.equals("1")) { //临时备用金 - } else if (impRestType.equals("2")) { + QFilter filter = new QFilter("zcgj_entryentity.zcgj_person", QCP.equals, applier.getPkValue());//可借款人员 + filter.and(new QFilter("zcgj_currentyear", QCP.equals, bizDateYear));//申请日期年份 + DynamicObject quotaImprestLedger = BusinessDataServiceHelper.loadSingle("zcgj_quotaimprestledger", + "id",new QFilter[]{filter});//定额备用金初始台账 + if (quotaImprestLedger != null) { + this.addFatalErrorMessage(dataEnt, "您在定额备用金初始化台账里,所以不能使用临时备用金!!"); + return; + } + }/* else if (impRestType.equals("2")) { //项目筹备备用金 QFilter filter = new QFilter("zcgj_entryentity.zcgj_person", QCP.equals, applier.getPkValue());// 可借款人员 filter.and(new QFilter("zcgj_entryentity.zcgj_isenabled", QCP.equals, true));// 启用 diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/LoanSlipReserveFundReverserOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/LoanSlipReserveFundReverserOp.java index 00b464b..659c34f 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/LoanSlipReserveFundReverserOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/LoanSlipReserveFundReverserOp.java @@ -79,13 +79,13 @@ public class LoanSlipReserveFundReverserOp extends AbstractOperationServicePlugI } else if (impRestType.equals("2")) { //项目筹备备用金 }*/ - } - } - if (!modifiedEntities.isEmpty()) { - try { - SaveServiceHelper.save(modifiedEntities.toArray(new DynamicObject[0])); - } catch (Exception ex) { - throw new RuntimeException(ex); + if (!modifiedEntities.isEmpty()) { + try { + SaveServiceHelper.save(modifiedEntities.toArray(new DynamicObject[0])); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } } } }