From bdd9ed56bc7c1ae0fafbd841e6de2a3bae9dbcc7 Mon Sep 17 00:00:00 2001 From: lihao <3139678155@qq.com> Date: Wed, 25 Dec 2024 19:25:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E8=BF=9B=E8=A1=8C=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/SSCTaskHandleQueryAction.java | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/ssctp/src/client/nccloud/web/ssctp/sscbd/ssctask/action/SSCTaskHandleQueryAction.java b/ssctp/src/client/nccloud/web/ssctp/sscbd/ssctask/action/SSCTaskHandleQueryAction.java index 22ce004..4f4b429 100644 --- a/ssctp/src/client/nccloud/web/ssctp/sscbd/ssctask/action/SSCTaskHandleQueryAction.java +++ b/ssctp/src/client/nccloud/web/ssctp/sscbd/ssctask/action/SSCTaskHandleQueryAction.java @@ -235,11 +235,53 @@ public class SSCTaskHandleQueryAction } whereSql.append(" ) "); } + //联查 付款单、收款单、主报销单、主借款单 四张单子 whereSql.append(" or task.pk_bill in ( "); - whereSql.append(" SELECT task.pk_bill FROM ssctp_task task LEFT JOIN AR_GATHERITEM bill on task.busiid = bill.pk_gatherbill LEFT JOIN BD_BALATYPE bala on bala.pk_balatype = bill.pk_balatype"); + whereSql.append(" SELECT " + + " pk_bill " + + "FROM " + + " ( " + + " SELECT " + + " task.pk_bill, " + + " bala.name " + + " FROM " + + " ssctp_task task " + + " INNER JOIN AR_GATHERITEM bill ON task.busiid = bill.pk_gatherbill " + + " INNER JOIN BD_BALATYPE bala ON bala.pk_balatype = bill.pk_balatype " + + " WHERE " + + " task.pk_billtype = '0000Z3000000000000F2' UNION " + + " SELECT " + + " task.pk_bill, " + + " bala.name " + + " FROM " + + " ssctp_task task " + + " INNER JOIN ap_paybill bill ON task.busiid = bill.pk_paybill " + + " INNER JOIN AP_PAYITEM item ON item.pk_paybill = bill.pk_paybill " + + " LEFT JOIN BD_BALATYPE bala ON bala.pk_balatype = item.pk_balatype " + + " WHERE " + + " task.pk_billtype = '0000Z3000000000000F3' UNION " + + " SELECT " + + " task.pk_bill, " + + " bala.name " + + " FROM " + + " ssctp_task task " + + " INNER JOIN er_bxzb bill ON task.busiid = bill.pk_jkbx " + + " INNER JOIN BD_BALATYPE bala ON bala.pk_balatype = bill.jsfs " + + " WHERE " + + " task.pk_billtype = '0000Z30000000000264X' UNION " + + " SELECT " + + " task.pk_bill, " + + " bala.name " + + " FROM " + + " ssctp_task task " + + " INNER JOIN er_jkzb bill ON task.busiid = bill.pk_jkbx " + + " INNER JOIN BD_BALATYPE bala ON bala.pk_balatype = bill.jsfs " + + " WHERE " + + " task.pk_billtype = '0000Z30000000000263X' " + + " ) pk_type "); whereSql.append(" where "); for (int i = 0; i < vas.size(); i++) { - whereSql.append(" bala.name LIKE '%").append(vas.get(i)).append("%'"); + whereSql.append(" pk_type.name LIKE '%").append(vas.get(i)).append("%'"); if (i < vas.size() - 1) { whereSql.append(" OR "); } From fa8e6321b75601a3849845c00a9ad8f6e30ad29f Mon Sep 17 00:00:00 2001 From: lihao <3139678155@qq.com> Date: Thu, 26 Dec 2024 09:47:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E8=BF=9B=E8=A1=8C=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/SSCTaskHandleQueryAction.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/ssctp/src/client/nccloud/web/ssctp/sscbd/ssctask/action/SSCTaskHandleQueryAction.java b/ssctp/src/client/nccloud/web/ssctp/sscbd/ssctask/action/SSCTaskHandleQueryAction.java index 4f4b429..bf2e0bf 100644 --- a/ssctp/src/client/nccloud/web/ssctp/sscbd/ssctask/action/SSCTaskHandleQueryAction.java +++ b/ssctp/src/client/nccloud/web/ssctp/sscbd/ssctask/action/SSCTaskHandleQueryAction.java @@ -248,8 +248,9 @@ public class SSCTaskHandleQueryAction " ssctp_task task " + " INNER JOIN AR_GATHERITEM bill ON task.busiid = bill.pk_gatherbill " + " INNER JOIN BD_BALATYPE bala ON bala.pk_balatype = bill.pk_balatype " + - " WHERE " + - " task.pk_billtype = '0000Z3000000000000F2' UNION " + +// " WHERE " + +// " task.pk_billtype = '0000Z3000000000000F2' " + + " UNION " + " SELECT " + " task.pk_bill, " + " bala.name " + @@ -258,8 +259,9 @@ public class SSCTaskHandleQueryAction " INNER JOIN ap_paybill bill ON task.busiid = bill.pk_paybill " + " INNER JOIN AP_PAYITEM item ON item.pk_paybill = bill.pk_paybill " + " LEFT JOIN BD_BALATYPE bala ON bala.pk_balatype = item.pk_balatype " + - " WHERE " + - " task.pk_billtype = '0000Z3000000000000F3' UNION " + +// " WHERE " + +// " task.pk_billtype = '0000Z3000000000000F3' " + + " UNION " + " SELECT " + " task.pk_bill, " + " bala.name " + @@ -267,8 +269,9 @@ public class SSCTaskHandleQueryAction " ssctp_task task " + " INNER JOIN er_bxzb bill ON task.busiid = bill.pk_jkbx " + " INNER JOIN BD_BALATYPE bala ON bala.pk_balatype = bill.jsfs " + - " WHERE " + - " task.pk_billtype = '0000Z30000000000264X' UNION " + +// " WHERE " + +// " task.pk_billtype = '0000Z30000000000264X' " + + " UNION " + " SELECT " + " task.pk_bill, " + " bala.name " + @@ -276,8 +279,8 @@ public class SSCTaskHandleQueryAction " ssctp_task task " + " INNER JOIN er_jkzb bill ON task.busiid = bill.pk_jkbx " + " INNER JOIN BD_BALATYPE bala ON bala.pk_balatype = bill.jsfs " + - " WHERE " + - " task.pk_billtype = '0000Z30000000000263X' " + +// " WHERE " + +// " task.pk_billtype = '0000Z30000000000263X' " + " ) pk_type "); whereSql.append(" where "); for (int i = 0; i < vas.size(); i++) {