diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/AccountbankReportFormPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/AccountbankReportFormPlugin.java index 0e797ad..cff4cff 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/AccountbankReportFormPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/AccountbankReportFormPlugin.java @@ -112,7 +112,7 @@ public class AccountbankReportFormPlugin extends AbstractReportFormPlugin { try { Path tempDir = Files.createTempDirectory("csv_export"); - Path tempFile = tempDir.resolve("四川能源发展集团有限责任公司_银行账户_01_" + reportNameExt); + Path tempFile = tempDir.resolve("四川能源发展集团有限责任公司_银行账户_01_" + reportNameExt+".csv"); // Path tempFile = Files.createTempFile("四川能源发展集团有限责任公司_银行账户_01_" + reportNameExt, ".csv"); CsvExportUtil.writeCsvToFile(tempFile, headers, rows2); // 上传到临时文件服务器 获取压缩包下载地址 diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/AccountbankReportPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/AccountbankReportPlugin.java index a69cfb0..638060f 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/AccountbankReportPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/AccountbankReportPlugin.java @@ -48,9 +48,10 @@ public class AccountbankReportPlugin extends AbstractReportListDataPlugin { "case when closedate IS NULL then '9999-12-31' else to_char(closedate,'YYYY-MM-DD') end as shkd_xhrq," + "opendate as shkd_khrq,'"+dateList.get(0)+"' as shkd_sjrq,case when ismoneypool=1 then '是' else '否' end as shkd_sfzjczh"; //银行账户数据集 + QFilter qFilter = new QFilter("finorgtype",QCP.not_equals,"1"); DataSet accountbankDataSet = QueryServiceHelper.queryDataSet(this.getClass().getSimpleName(),"am_accountbank", selectFields - , null, null); + , qFilter.toArray(), null); String[] fieldNames = accountbankDataSet.getRowMeta().getFieldNames(); String[] newFieldNames = ReportUtils.ExpansionArray(fieldNames, Arrays.asList("fid", "fbasedataid as shkd_bz"));