From 988f6f99ab85e52977e6379c414c894934011299 Mon Sep 17 00:00:00 2001 From: zxf Date: Thu, 6 Apr 2023 20:33:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=AE=BF=E6=AC=A1=E6=95=B0=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/classes/com/hangxin/web/ZqlAction.class | Bin 12658 -> 12892 bytes build/classes/html/tick/hfcounttj.html | 3 ++- .../classes/com/hangxin/web/ZqlAction.class | Bin 12658 -> 12892 bytes .../WEB-INF/classes/html/tick/hfcounttj.html | 3 ++- .../artifacts/rushfee_Web_exploded/ptrun.ini | 2 +- resource/html/tick/hfcounttj.html | 3 ++- src/com/hangxin/web/ZqlAction.java | 9 +++++---- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/build/classes/com/hangxin/web/ZqlAction.class b/build/classes/com/hangxin/web/ZqlAction.class index 16aa3fefd5b2ac220d155cb445709009a22f0162..178bd4fe0ffcc9afab7511f9256ff23ed7503c92 100644 GIT binary patch delta 247 zcmeyAbSGuQZD}SJ@5y(iwZj!OvI{b@vQll;jVuiG3=Gs2@{1G{U}DAw5HST*QA-Q3 zN==2tyc7k6thAEM+*F0kVuif?5{10doE!y($>&7HCL73fvDm5`8%*9W<1%@Pj2J7B zV`(w@fQ$i0abjLpW@%F5
-
+
+
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/ZqlAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/ZqlAction.class index 16aa3fefd5b2ac220d155cb445709009a22f0162..178bd4fe0ffcc9afab7511f9256ff23ed7503c92 100644 GIT binary patch delta 247 zcmeyAbSGuQZD}SJ@5y(iwZj!OvI{b@vQll;jVuiG3=Gs2@{1G{U}DAw5HST*QA-Q3 zN==2tyc7k6thAEM+*F0kVuif?5{10doE!y($>&7HCL73fvDm5`8%*9W<1%@Pj2J7B zV`(w@fQ$i0abjLpW@%F5
-
+
+
diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini index 9a5751a..18ccbc2 100644 --- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini +++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini @@ -1,3 +1,3 @@ #save ini -#Sun Mar 19 23:25:21 CST 2023 +#Mon Apr 03 21:21:37 CST 2023 deploystamp=1612237236000 diff --git a/resource/html/tick/hfcounttj.html b/resource/html/tick/hfcounttj.html index 9cb4d21..6d65fa7 100644 --- a/resource/html/tick/hfcounttj.html +++ b/resource/html/tick/hfcounttj.html @@ -29,7 +29,8 @@
-
+
+
diff --git a/src/com/hangxin/web/ZqlAction.java b/src/com/hangxin/web/ZqlAction.java index 974f6ec..4460211 100644 --- a/src/com/hangxin/web/ZqlAction.java +++ b/src/com/hangxin/web/ZqlAction.java @@ -249,11 +249,12 @@ public class ZqlAction { " left join ( select addtime,kpxm,kphjje,ghf_custid from einvoice_fpkjxx_fptxx where to_char（addtime,'yyyy-mm-dd'）>='"+jftime+"') c on b.customer_id=c.ghf_custid" + " left join customer_info u on b.customer_id=u.customer_id where 1=1 "+sqljy+sqlmz +") group by num order by num ";*/ - String sql="select num ,count(1) sl, sum( case when jftime is not null then 1 else 0 end ) jfsl," + + String sql="select num ,count(1) sl, sum( case when (kphjje='280.00' or kphjje='300.00' or kphjje='398.00' ) and jftime is not null then 1 else 0 end ) jfsl," + " sum( case when kphjje='280.00' and jftime is not null then 1 else 0 end ) fwf , " + - " sum ( case when kphjje!='280.00' and jftime is not null then 1 else 0 end) tg," + - " round(sum(case when kphjje!='280.00' and jftime is not null then 1 else 0 end)/count(1) ,4)*100 ||'%' tgbl," + - " round(sum(case when jftime is not null then 1 else 0 end)/count(1) ,4)*100 ||'%' jfbl" + + " sum ( case when kphjje='300.00' and jftime is not null then 1 else 0 end) tg," + + " sum ( case when kphjje='398.00' and jftime is not null then 1 else 0 end) sanjiuba," + + " round(sum(case when kphjje='300.00' and jftime is not null then 1 else 0 end)/count(1) ,4)*100 ||'%' tgbl," + + " round(sum(case when (kphjje='280.00' or kphjje='300.00' or kphjje='398.00' ) and jftime is not null then 1 else 0 end)/count(1) ,4)*100 ||'%' jfbl" + " from (" + " select to_char(c.addtime,'yyyy-mm-dd') jftime ,c.kpxm ,c.kphjje ," + " (select count(1) from rush_log where obj_id=b.id ) num ,a.custtype " +