From 552af0d1829b49ce1d7934147d13e24860642a28 Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Wed, 16 Jul 2025 15:30:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E5=87=BA=E8=B4=A2=E5=8A=A1=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=8D=95=E7=A7=91=E7=9B=AE=E5=88=86=E7=B1=BB=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/OutContractFinaceConfirmePlugin.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmePlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmePlugin.java index b0bad53..580df36 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmePlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmePlugin.java @@ -124,10 +124,11 @@ public class OutContractFinaceConfirmePlugin extends AbstractBillPlugIn impleme if(dynamicObjectCollection!=null){ DynamicObject zcgjExpenseitem = dynamicObjectCollection.get(rowIndex).getDynamicObject("zcgj_expenseitem"); QFilter filter = new QFilter("zcgj_entryentity.zcgj_fee",QCP.equals,zcgjExpenseitem.getLong("id")); + QFilter biztypefilter = new QFilter("zcgj_biztype",QCP.equals,"10"); //过滤业务单据为支出财务确认单 //分录过滤 //使用BusinessDataServiceHelper.load查出来的数据，返回的是符合条件的整单，即使只有分录中的某一行符合条件，也会返回整张单包括其他分录行的数据 //使用 QueryServiceHelper.query查出来的数据只会包含符合条件的分录行，不含其他行数据 - DynamicObjectCollection accountfeeEntries = QueryServiceHelper.query("zcgj_accountfee", "zcgj_entryentity.zcgj_accounttype", new QFilter[]{filter}); + DynamicObjectCollection accountfeeEntries = QueryServiceHelper.query("zcgj_accountfee", "zcgj_entryentity.zcgj_accounttype", new QFilter[]{filter,biztypefilter}); if(accountfeeEntries!=null && accountfeeEntries.size()==1){ long id = accountfeeEntries.get(0).getLong("zcgj_entryentity.zcgj_accounttype"); this.getModel().setValue("zcgj_accounttype",id,rowIndex); @@ -288,18 +289,6 @@ public class OutContractFinaceConfirmePlugin extends AbstractBillPlugIn impleme HasPermOrgResult userHasPermOrgs = PermissionServiceHelper.getUserHasPermOrgs(Long.parseLong(RequestContext.get().getUserId())); //有权的组织 List hasPermOrgs = userHasPermOrgs.getHasPermOrgs(); - - //IPageCache iPageCache = this.getView().getParentView().getService(IPageCache.class); - //String listOrgId = iPageCache.get("current_zcgj_orgid_out"); - //List ids = new ArrayList<>(); - /*if(StringUtils.isNotBlank(listOrgId)){ - for (String s : listOrgId.split(",")) { - hasPermOrgs.add(Long.parseLong(s)); - } - }*/ - - // DynamicObject zcgjOrg = (DynamicObject) this.getModel().getValue("zcgj_org"); - ListShowParameter showParameter = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); QFilter qFilter = new QFilter("org", QCP.in, hasPermOrgs); showParameter.getListFilterParameter().getQFilters().add(qFilter); @@ -323,10 +312,11 @@ public class OutContractFinaceConfirmePlugin extends AbstractBillPlugIn impleme DynamicObject zcgjExpenseitem = dynamicObjectCollection.get(row).getDynamicObject("zcgj_expenseitem"); if(zcgjExpenseitem!=null){ QFilter filter = new QFilter("zcgj_entryentity.zcgj_fee",QCP.equals,zcgjExpenseitem.getLong("id")); + QFilter biztypefilter = new QFilter("zcgj_biztype",QCP.equals,"10"); //过滤业务单据为支出财务确认单 //分录过滤 //使用BusinessDataServiceHelper.load查出来的数据，返回的是符合条件的整单，即使只有分录中的某一行符合条件，也会返回整张单包括其他分录行的数据 //使用 QueryServiceHelper.query查出来的数据只会包含符合条件的分录行，不含其他行数据 - DynamicObjectCollection accountfeeEntries = QueryServiceHelper.query("zcgj_accountfee", "zcgj_entryentity.zcgj_accounttype.number", new QFilter[]{filter}); + DynamicObjectCollection accountfeeEntries = QueryServiceHelper.query("zcgj_accountfee", "zcgj_entryentity.zcgj_accounttype.number", new QFilter[]{filter,biztypefilter}); List numbers = new ArrayList<>(); if(accountfeeEntries!=null){ for (DynamicObject dynamicObject : accountfeeEntries) {