From 02721849d5fa354520b393f0d241e023a1f1c979 Mon Sep 17 00:00:00 2001 From: zoujiangtao Date: Fri, 14 Nov 2025 18:48:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=9A=E5=80=9F=E6=AC=BE=E5=90=88=E5=90=8C=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=80=BA=E6=9D=83=E4=BA=BA=E9=80=89=E6=8B=A9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E8=B5=84=E6=96=99=20=E6=97=B6=E9=97=B4=EF=BC=9A2025-11-14=2014?= =?UTF-8?q?=EF=BC=9A23=20=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=82=B9?= =?UTF-8?q?=E6=B1=9F=E6=B6=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/ChangeContractDebtorEdit.java | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ChangeContractDebtorEdit.java diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ChangeContractDebtorEdit.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ChangeContractDebtorEdit.java new file mode 100644 index 0000000..835c303 --- /dev/null +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ChangeContractDebtorEdit.java @@ -0,0 +1,86 @@ +package shkd.sys.sys.plugin.form; + +import kd.bos.dataentity.entity.DynamicObject; +import kd.bos.dataentity.resource.ResManager; +import kd.bos.form.field.events.BeforeF7SelectEvent; +import kd.bos.form.field.events.BeforeF7SelectListener; +import kd.bos.list.ListShowParameter; +import kd.bos.orm.query.QFilter; +import kd.tmc.cfm.common.helper.CfmBillCommonHelper; +import kd.tmc.cfm.formplugin.bill.AbstractMultCateTextF7Plugin; +import kd.tmc.fbp.common.enums.BankAcctStatusEnum; +import kd.tmc.fbp.common.helper.TmcAccountHelper; +import kd.tmc.fbp.common.util.EmptyUtil; + +/** + * @Description 借款合同变更债权人选择基础资料 + * @Author Tao + * @Date 2025/10/21 + */ +public class ChangeContractDebtorEdit extends AbstractMultCateTextF7Plugin implements BeforeF7SelectListener { + @Override + protected String getTypePropName() { + return "creditortype"; + } + + @Override + protected String getTextPropName() { + return "textcreditor"; + } + + @Override + protected String getIdPropName() { + return "creditor"; + } + + @Override + public void beforeF7Select(BeforeF7SelectEvent evt) { + switch (evt.getProperty().getName()) { + case "loaneracctbank": + this.creditorBankAcctF7Evt(evt); + break; + case "accountbank": + this.debtorBankAcctF7Evt(evt); + } + } + + private void creditorBankAcctF7Evt(BeforeF7SelectEvent evt) { + this.bankAcctF7Evt(evt, "creditorg"); + } + + private void debtorBankAcctF7Evt(BeforeF7SelectEvent evt) { + this.bankAcctF7Evt(evt, "org"); + } + + private void bankAcctF7Evt(BeforeF7SelectEvent evt, String orgProp) { + if (this.isCurrencyInputYet(evt)) { + DynamicObject fundOrg = (DynamicObject)this.getModel().getValue(orgProp); + if (EmptyUtil.isEmpty(fundOrg)) { + evt.setCancel(true); + this.getView().showTipNotification(String.format(ResManager.loadKDString("请先选择%s。", "ContractCreditorDebtorEdit_3", "tmc-cfm-formplugin", new Object[0]), CfmBillCommonHelper.getPropLocalDisplayName(this.getView(), orgProp))); + } else { + QFilter qFilter = this.getBankAcctFilter(fundOrg); + ListShowParameter sp = (ListShowParameter)evt.getFormShowParameter(); + sp.setUseOrgId((Long)fundOrg.getPkValue()); + sp.setIsolationOrg(true); + sp.getListFilterParameter().setFilter(qFilter); + } + } + } + + private boolean isCurrencyInputYet(BeforeF7SelectEvent evt) { + DynamicObject currency = (DynamicObject)this.getModel().getValue("currency"); + if (EmptyUtil.isEmpty(currency)) { + evt.setCancel(true); + this.getView().showTipNotification(String.format(ResManager.loadKDString("请先选择%s。", "ContractCreditorDebtorEdit_3", "tmc-cfm-formplugin", new Object[0]), CfmBillCommonHelper.getPropLocalDisplayName(this.getView(), "currency"))); + return false; + } else { + return true; + } + } + + private QFilter getBankAcctFilter(DynamicObject fundOrg) { + long orgId = fundOrg == null ? 0L : Long.parseLong(fundOrg.getPkValue().toString()); + return TmcAccountHelper.getAccountBankFilterByOrg(orgId).and("acctstatus", "=", BankAcctStatusEnum.NORMAL.getValue()).and(new QFilter("acctclassify", "!=", "I")); + } +} From cb601266675727696e6a62e019b6254105de2cf9 Mon Sep 17 00:00:00 2001 From: 16358 <1635849544@qq.com> Date: Fri, 14 Nov 2025 18:50:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?=E5=88=98=E6=A3=AE=E6=BE=B3=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/1?= =?UTF-8?q?1/14=2018:50=20=E5=86=85=E5=AE=B9=EF=BC=9A=E6=8B=85=E4=BF=9D?= =?UTF-8?q?=E5=90=88=E5=90=8C=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/sys/plugin/report/GuaranteeContractPatchPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractPatchPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractPatchPlugin.java index c70de95..551eba1 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractPatchPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractPatchPlugin.java @@ -52,7 +52,7 @@ public class GuaranteeContractPatchPlugin extends AbstractReportListDataPluginEx " b.fgratio AS shkd_gratio\n" + "FROM \n" + " t_gm_guarcontract AS a\n" + - " LEFT JOIN t_gm_guaranteed_entry AS b \n" + + " LEFT JOIN t_gm_guarantee_entry AS b \n" + " ON a.fid = b.fid"); DataSet hl = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), sqlBuilder.toString());//系统云 JoinDataSet join = dataSet.join(hl, JoinType.LEFT);