From 0900ed0e4e76ff9970372f5e25586b273876ecd3 Mon Sep 17 00:00:00 2001 From: zhangzhiguo Date: Mon, 16 Dec 2024 19:57:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/BudgetActuRptQueryPlugin.java | 23 +++++++++++++- .../report/FeeDeductionRptQueryPlugin.java | 12 ++++++- .../report/PositionFeesRptQueryPlugin.java | 31 +++++++++++++------ .../fs/plugin/report/VisitRptQueryPlugin.java | 11 +++++++ 4 files changed, 66 insertions(+), 11 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/BudgetActuRptQueryPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/BudgetActuRptQueryPlugin.java index ea40d6f..beb1bae 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/BudgetActuRptQueryPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/BudgetActuRptQueryPlugin.java @@ -432,12 +432,23 @@ public class BudgetActuRptQueryPlugin extends AbstractReportListDataPlugin { private DataSet getDailyreimbursebillDataSet(Long userId, Integer year,Boolean isBusinessForeign) { LocalDate firstDay = getFirstDayOfYear(year); LocalDate lastDay = getLastDayOfYear(year); + List billStatuslist = new ArrayList<>(); + //billStatuslist.add("A"); //暂存 + //billStatuslist.add("B"); //已提交 + //billStatuslist.add("C"); //审核中 + //billStatuslist.add("D"); //审核未通过 + billStatuslist.add("E"); //审核通过 + billStatuslist.add("F"); //等待付款 + billStatuslist.add("G"); //已付款 + //billStatuslist.add("H"); //废弃 + billStatuslist.add("I"); //关闭 List searchFilterList = new ArrayList<>(); //searchFilterList.add(new QFilter(DEV_KEY+"_year", QCP.equals, getFirstDayOfYear(year))); searchFilterList.add(new QFilter("applier", QCP.equals, userId)); searchFilterList.add(new QFilter("expenseentryentity.happendate", QCP.large_equals, firstDay)); searchFilterList.add(new QFilter("expenseentryentity.happendate", QCP.less_equals, lastDay)); searchFilterList.add(new QFilter(DEV_KEY+"_is_business_foreign", QCP.equals, isBusinessForeign)); + searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤 DataSet bdMaterialDataSet = QueryServiceHelper.queryDataSet(this.getClass().getName(), "er_dailyreimbursebill", "id,description," + @@ -457,13 +468,23 @@ public class BudgetActuRptQueryPlugin extends AbstractReportListDataPlugin { private DataSet getTripreimburseDataSet(Long userId, Integer year,Boolean isBusinessForeign) { LocalDate firstDay = getFirstDayOfYear(year); LocalDate lastDay = getLastDayOfYear(year); + List billStatuslist = new ArrayList<>(); + //billStatuslist.add("A"); //暂存 + //billStatuslist.add("B"); //已提交 + //billStatuslist.add("C"); //审核中 + //billStatuslist.add("D"); //审核未通过 + billStatuslist.add("E"); //审核通过 + billStatuslist.add("F"); //等待付款 + billStatuslist.add("G"); //已付款 + //billStatuslist.add("H"); //废弃 + billStatuslist.add("I"); //关闭 List searchFilterList = new ArrayList<>(); //searchFilterList.add(new QFilter(DEV_KEY+"_year", QCP.equals, getFirstDayOfYear(year))); searchFilterList.add(new QFilter("applier", QCP.equals, userId)); searchFilterList.add(new QFilter("tripentry.startdate", QCP.large_equals, firstDay)); searchFilterList.add(new QFilter("tripentry.startdate", QCP.less_equals, lastDay)); searchFilterList.add(new QFilter(DEV_KEY+"_is_business_foreign", QCP.equals, isBusinessForeign)); - + searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤 DataSet bdMaterialDataSet = QueryServiceHelper.queryDataSet( this.getClass().getName(), "er_tripreimbursebill", diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/FeeDeductionRptQueryPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/FeeDeductionRptQueryPlugin.java index bbba6f0..87a01ee 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/FeeDeductionRptQueryPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/FeeDeductionRptQueryPlugin.java @@ -93,7 +93,17 @@ public class FeeDeductionRptQueryPlugin extends AbstractReportListDataPlugin { searchFilterList.add(new QFilter("tripentry.startdate", QCP.large_equals, firstDay)); searchFilterList.add(new QFilter("tripentry.startdate", QCP.less_equals, lastDay)); } - + List billStatuslist = new ArrayList<>(); + //billStatuslist.add("A"); //暂存 + //billStatuslist.add("B"); //已提交 + //billStatuslist.add("C"); //审核中 + //billStatuslist.add("D"); //审核未通过 + billStatuslist.add("E"); //审核通过 + billStatuslist.add("F"); //等待付款 + billStatuslist.add("G"); //已付款 + //billStatuslist.add("H"); //废弃 + billStatuslist.add("I"); //关闭 + searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤 DataSet bdMaterialDataSet = QueryServiceHelper.queryDataSet( this.getClass().getName(), diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java index aa9cc81..e665064 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/PositionFeesRptQueryPlugin.java @@ -313,10 +313,21 @@ public class PositionFeesRptQueryPlugin extends AbstractReportListDataPlugin { public DynamicObject[] getDailyreimbursebillDataSet(Long userId, Integer year){ LocalDate firstDay = getFirstDayOfYear(year); LocalDate lastDay = getLastDayOfYear(year); + List billStatuslist = new ArrayList<>(); + //billStatuslist.add("A"); //暂存 + //billStatuslist.add("B"); //已提交 + //billStatuslist.add("C"); //审核中 + //billStatuslist.add("D"); //审核未通过 + billStatuslist.add("E"); //审核通过 + billStatuslist.add("F"); //等待付款 + billStatuslist.add("G"); //已付款 + //billStatuslist.add("H"); //废弃 + billStatuslist.add("I"); //关闭 List searchFilterList = new ArrayList<>(); searchFilterList.add(new QFilter("applier", QCP.equals, userId)); searchFilterList.add(new QFilter("expenseentryentity.happendate", QCP.large_equals, firstDay)); searchFilterList.add(new QFilter("expenseentryentity.happendate", QCP.less_equals, lastDay)); + searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤 DynamicObject[] load = BusinessDataServiceHelper.load("er_dailyreimbursebill", "id,description,billno,expenseentryentity," + DEV_KEY+"_is_business_foreign,"+ @@ -335,19 +346,21 @@ public class PositionFeesRptQueryPlugin extends AbstractReportListDataPlugin { private DynamicObject[] getTripreimburseDataSet(Long userId, Integer year) { LocalDate firstDay = getFirstDayOfYear(year); LocalDate lastDay = getLastDayOfYear(year); + List billStatuslist = new ArrayList<>(); + //billStatuslist.add("A"); //暂存 + //billStatuslist.add("B"); //已提交 + //billStatuslist.add("C"); //审核中 + //billStatuslist.add("D"); //审核未通过 + billStatuslist.add("E"); //审核通过 + billStatuslist.add("F"); //等待付款 + billStatuslist.add("G"); //已付款 + //billStatuslist.add("H"); //废弃 + billStatuslist.add("I"); //关闭 List searchFilterList = new ArrayList<>(); - //searchFilterList.add(new QFilter(DEV_KEY+"_year", QCP.equals, getFirstDayOfYear(year))); searchFilterList.add(new QFilter("applier", QCP.equals, userId)); searchFilterList.add(new QFilter("tripentry.startdate", QCP.large_equals, firstDay)); searchFilterList.add(new QFilter("tripentry.startdate", QCP.less_equals, lastDay)); - //searchFilterList.add(new QFilter(DEV_KEY+"_is_business_foreign", QCP.equals, isBusinessForeign)); - /*DataSet bdMaterialDataSet = QueryServiceHelper.queryDataSet( - this.getClass().getName(), - "er_tripreimbursebill", - "id,applier,billno,tripentry.startdate as startdate," + - "tripentry.entryentity.orientryamount as orientryamount" , - searchFilterList.toArray(new QFilter [] {}), null - ).orderBy(new String[]{"applier", "startdate"});*/ + searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤 DynamicObject[] load = BusinessDataServiceHelper.load("er_tripreimbursebill", "id,description,billno,expenseentryentity," + DEV_KEY+"_is_business_foreign,"+ diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/VisitRptQueryPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/VisitRptQueryPlugin.java index 1cb65bb..78b4567 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/VisitRptQueryPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/report/VisitRptQueryPlugin.java @@ -98,6 +98,17 @@ public class VisitRptQueryPlugin extends AbstractReportListDataPlugin { searchFilterList.add(new QFilter("zcgj_holiday_start_time", QCP.large_equals, firstDay)); searchFilterList.add(new QFilter("zcgj_holiday_start_time", QCP.less_equals, lastDay)); } + List billStatuslist = new ArrayList<>(); + //billStatuslist.add("A"); //暂存 + //billStatuslist.add("B"); //已提交 + //billStatuslist.add("C"); //审核中 + //billStatuslist.add("D"); //审核未通过 + billStatuslist.add("E"); //审核通过 + billStatuslist.add("F"); //等待付款 + billStatuslist.add("G"); //已付款 + //billStatuslist.add("H"); //废弃 + billStatuslist.add("I"); //关闭 + searchFilterList.add(new QFilter("billstatus", QCP.in, billStatuslist));//增加过滤 DataSet bdMaterialDataSet = QueryServiceHelper.queryDataSet( this.getClass().getName(), "er_dailyreimbursebill",