From efb3c660a38388f27e4f8c322e60d6e00e4f5c61 Mon Sep 17 00:00:00 2001 From: zxf Date: Sun, 2 Apr 2023 20:15:20 +0800 Subject: [PATCH] 1 --- .../com/hangxin/web/SatisfacTion.class | Bin 68928 -> 69036 bytes .../com/hangxin/web/TickingAction.class | Bin 11522 -> 12528 bytes build/classes/html/tick/anzhuangdan.html | 2 +- build/classes/html/tick/cancel.html | 2 +- build/classes/html/tick/cancellist.html | 12 ++++- build/classes/html/tick/kaohezongbiao.html | 2 +- build/classes/html/tick/paigongdan.html | 2 +- build/classes/html/tick/satisfac.html | 2 +- build/classes/html/tick/satisfaccount.html | 2 +- build/classes/html/tick/shijiday.html | 1 + build/classes/html/tick/zhunquelvbaobiao.html | 2 +- .../com/hangxin/web/SatisfacTion.class | Bin 68928 -> 69036 bytes .../com/hangxin/web/TickingAction.class | Bin 11522 -> 12528 bytes .../classes/html/tick/anzhuangdan.html | 2 +- .../WEB-INF/classes/html/tick/cancel.html | 2 +- .../WEB-INF/classes/html/tick/cancellist.html | 12 ++++- .../classes/html/tick/kaohezongbiao.html | 2 +- .../WEB-INF/classes/html/tick/paigongdan.html | 2 +- .../WEB-INF/classes/html/tick/satisfac.html | 2 +- .../classes/html/tick/satisfaccount.html | 2 +- .../WEB-INF/classes/html/tick/shijiday.html | 1 + .../classes/html/tick/zhunquelvbaobiao.html | 2 +- .../artifacts/rushfee_Web_exploded/ptrun.ini | 2 +- resource/html/tick/anzhuangdan.html | 2 +- resource/html/tick/cancel.html | 2 +- resource/html/tick/cancellist.html | 12 ++++- resource/html/tick/kaohezongbiao.html | 2 +- resource/html/tick/paigongdan.html | 2 +- resource/html/tick/satisfac.html | 2 +- resource/html/tick/satisfaccount.html | 2 +- resource/html/tick/shijiday.html | 1 + resource/html/tick/shijidayhlnew.html | 1 + resource/html/tick/shijidaynew.html | 1 + resource/html/tick/zhunquelvbaobiao.html | 2 +- src/com/hangxin/web/SatisfacTion.java | 15 +++++- src/com/hangxin/web/TickingAction.java | 48 +++++++++++++----- src/rush/UpdateExcustomerTime.java | 48 ++++++++++++++++++ 37 files changed, 155 insertions(+), 41 deletions(-) create mode 100644 src/rush/UpdateExcustomerTime.java diff --git a/build/classes/com/hangxin/web/SatisfacTion.class b/build/classes/com/hangxin/web/SatisfacTion.class index d51211e909c3305f408fb650619a2c73fa90aacd..9a1ad48a90ef8a38b68965408acdcd83a953675e 100644 GIT binary patch delta 14388 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 DL{@Q6 diff --git a/build/classes/com/hangxin/web/TickingAction.class b/build/classes/com/hangxin/web/TickingAction.class index 5663fb6ade7a8763770c6fe7a0880132bca4751a..455d0a59cab443b209535116a1c0713945c75c4e 100644 GIT binary patch delta 3812 zcmcInd3;pW75>gFd3RpkBw-+vOcwG;APWiE*f9YSfOG2Q(U;V@RW$rug-gnRW z&i9>j-(>6Jcm2VOADuY|U=-Er&~QP=3;346w{?66-xath@I4JL3T)M3;w3fveSsec z+$C_Qj+gO6HUEmhkJQqu0zEcEZ)Pv1pcku{zu?_wfO^q6G0XFLxC=VlLFlWrvyF{ z=;6%-K_ti~$S%ks$SEjBkS0h7atYD}#R@V6xdp|!D4r4o4baI$133l_5|k*&D=0}& zvLK(J6hWy12Lz=FN*6R(P=+AWBWQ@AOhH+Kh6);{QTBliM3mdP(Kdv%Y$k{K>)da@ z!$vR4w3uDltFcC-JcEW)J|SUw)9S{y_QDl`_GwKs*wU!Lpb=CkUx}#`MO18136;t+ zZG7xVgGSM4gT~NUxkVc^Y#fazc&?l}d-?ADmv`Rx)}bA5p4@(A&t8Kj&fVUlS;wWKbEE%eS>D_K7q}mWUrKDK^`0qVY1pHI=WWa-nNl;%b^=&{V3> zXqrJctB{p6TApy_+o#hl@{%hxdpg}}&Ci zL-gD2RWw^ZrdMaoQGVu9H30;}^fxz{{=&xQRm;l_nojd%LhL(KDSKke;?1U(m8(_- z%1g%;n}iN|-km598g(?&veMmgLDMWS+d9_d*8AH6X76Xi%0P2?vsrGA96!$F{Y%Yu zH68hsL=4jmtiEcuS=?u-xgpQ=x0x-0#*H1#1<_bm1XJ$?DDQQTw4qWV)AOU4h;i2orQ+ilcokzUm&X2$IQh`!d)^Yk+IXU*F!iwwZ;`Y3*oR zxjYca;iyMV`9}O&S)GuTqAISv(BII|-nb@EHm_>g)XDQIa&rhHr5T?p%UFY@mem@c zBzMN=cix|HMsqAt>m{}{`HU^8GnhQp8EoQHR(;$ca4YlJ%y&h6<vCyT#-op+w4fkuHSU zFoDV0#^icYial0x8T|Tvn2W}VGOoxkSjqJ(AITy2hC(uXM>+c#zK+TFxVzz+=@~jJ zUk=VHW+YWvS+}Wjm>7B>ieyX_Nl_Sy&O)mavBQI*;j&3VnkA95KXZFIKEJ(qY?d!) zy}*I?44q=7d<+9PTvs$um*rmdU6k zKLgUZiXY@^*~S%}!&*PVmW#pezyY?@FOcmPg|THA#m(>}Pa3GjA{=DPjb)gRLu|!y zsm#D(96>w>@N#(_MFJ=ARJZ^h8fMn2F4S2^a9OxHsAA4!M!Sh`LqzH*wRo$)i}+21x8X8zJhH*mT4^AiZeW^vuu}emaSN;QA^?I;WH{W+^E>4 z;j35w@r?QdQc^y^d&=s^^RvwJ^Vjlx8s#(dJrlbzNv32!VliHvSflvrNBCm-cwV;G zv*bEUwMvWNQng}faT{Bf7R%W9*jlh63;5InCBQ)gm{|{VI*{2M#5^W4gI?w?iCIf# zx_l_36wIYG1Q${|)=&mo$;1xI#1oW@!<0w0bR)|;nPsi`BxMc$FI_)bS)XTF&na0G z)r*%las>)zuq&kNr{vQ7l%T&GzI`ww-B1^jr_@s)md9}z>5;_-o-5$5=a$GK`J4wa zJF*_&X{BqjQbXxm7_nRTXHe@3gD>j**t~@dNGv2hCxv=OLcv zBZ(FugF7Xc7NLTBa2eGhK=n9658wptwq#Uq>?7PLsyo#?x$hYo?oM7)-5KQe0R>A@ z7Jb?Uaic=0B3t4RNwl@qF0_@}eQ#}>#M)x%qHS@(|Gt@wG4}KO{JuKh7iYr!@#R1iZt{h z{8`~Og}-R=uX?y>;B^yaX!YT5xTNrRZT24u|I~;7rSJrU2;vQe;|fnHoKQHa@TS7Q z_2K_0{8!|*6U8H5C5A~=BCU(5#Ha9}5=)6+Ns^Le zB|Vh%R1#3qOG$4feGEwvcq>-d+7HNO>Dzc9VSpGZWP)ThHoNK*5 zk}m!13*J873`;Vlzx|qbsV_@{mJE<=L5VF!Vcxpn=-^mGax57rgDe>=Awlwrn&s6S zt5&ZWR#&yTdUA~=xsqp}G*Zi$NdQIWD4I8SqPFr2K(U8%Wj3I)N<~G+@ zxyp{1bJaL)eY{Mtd-{62M#@Ax*Y~>Yvs0~#*)_LpSvxw^acp1vzJ~Ta+uIMF>}Y9f z-}89;p}lQ;9(%RvnNV=uhG2A8+u?`XwzqO`bbCi*OGnEiT@UH)_F}7EcGuc)cMif+Ja+{`CI4c2hi z3j6ece&gTYo9XOL;R;~J_G)P@YI$ZIwLZ>u{M%TEO`JBz%p_%ZHIw~u%-l*dTd>tZ zQ!8bk>k7Fw4BTbl zvqm0vixK@}+J|&c!kxtYxmXgW4hnV2<$^9rNQq-h`QN$RLo;{d9w!M+gBCFKq``$w z=#>t+m2m@=@!-bAf=j|E>?M2`(^8CmPH|>BzJ-n@^SQ}yQa9KCda&PuqMZ-?vAFIBQ5C)aI*%U#Qm%i z4|?NKd>&sQ+)R#NBp`!Td>`wko)sM;SqCX466|g~NJ+n{b~+UL!YE;(9HP>~4VaII zDEYAj*WqDGNlfW9JVNuyd`@Bc9YzlZ@a1R$5Y}wQ?&6%>jD$di>sc5PWKJJ?imK?H zU~&d|_Y;pMH5lFA8S6+|jyAiW8z09Jj@|Nhlnxs@9VYDLc|R|dh4zWOqtavt3ySPr zL&|5Q`64I|%;J#dj$m?NHl+eB%%KoL=_uh?A5I6iPl@S|@CTgm4=5VP>pMa&U%9lf*Zpk&@5p z*2KqLmb%f}Kw6*vFs;oPJv~1#CW5hcbKar%2@XdI zzFsr;e;}AN&*QBI@xsmP#wUtIC6XeOHoUV34z^uY#6 z;T_c%howInB#S>ThRO^nkohwFlgU;1qm%W?=IUukKSVl{C0kfliVQYIlQrL-T9_VQ z5JB2O1UpN7Arr;=FAgk!x|xg*G!u~)^Ll}lGuNY;>#L9~~PYk-^j;U{krA!JGbi{8EZK-dwy>j^HdMH~)or$mv55 zvUpYMK8(Kfvh_=EQv9Xo^or9lx{ZLex7c0X8YV)+&BTy^XW~oe*hKtg(t-_1Trv4{ Li=<-x;KcU;CR)96 diff --git a/build/classes/html/tick/anzhuangdan.html b/build/classes/html/tick/anzhuangdan.html index 23ab652..60d5b88 100644 --- a/build/classes/html/tick/anzhuangdan.html +++ b/build/classes/html/tick/anzhuangdan.html @@ -8,7 +8,7 @@
diff --git a/build/classes/html/tick/cancel.html b/build/classes/html/tick/cancel.html index d723153..6c21480 100644 --- a/build/classes/html/tick/cancel.html +++ b/build/classes/html/tick/cancel.html @@ -16,7 +16,7 @@ --> diff --git a/build/classes/html/tick/cancellist.html b/build/classes/html/tick/cancellist.html index 5029785..ee0de98 100644 --- a/build/classes/html/tick/cancellist.html +++ b/build/classes/html/tick/cancellist.html @@ -8,7 +8,7 @@
@@ -78,6 +78,16 @@ return (2-0.2*value).toFixed(2); } } + + if(nianfen=='2023'){ + var row = e.row; + var value = row.noready; + if(value>=10){ + return 0; + }else{ + return (2-0.2*value).toFixed(2); + } + } /* if(parseFloat(value)>=parseFloat("90")){ return 3 ; }else if(parseFloat("80")<=parseFloat(value)        查询    diff --git a/build/classes/html/tick/paigongdan.html b/build/classes/html/tick/paigongdan.html index 15bd41e..65aea03 100644 --- a/build/classes/html/tick/paigongdan.html +++ b/build/classes/html/tick/paigongdan.html @@ -8,7 +8,7 @@
diff --git a/build/classes/html/tick/satisfac.html b/build/classes/html/tick/satisfac.html index cdcca48..750909e 100644 --- a/build/classes/html/tick/satisfac.html +++ b/build/classes/html/tick/satisfac.html @@ -9,7 +9,7 @@ diff --git a/build/classes/html/tick/satisfaccount.html b/build/classes/html/tick/satisfaccount.html index a954c2d..d1a9fb6 100644 --- a/build/classes/html/tick/satisfaccount.html +++ b/build/classes/html/tick/satisfaccount.html @@ -8,7 +8,7 @@
diff --git a/build/classes/html/tick/shijiday.html b/build/classes/html/tick/shijiday.html index 515d4e6..c239001 100644 --- a/build/classes/html/tick/shijiday.html +++ b/build/classes/html/tick/shijiday.html @@ -21,6 +21,7 @@
+
diff --git a/build/classes/html/tick/zhunquelvbaobiao.html b/build/classes/html/tick/zhunquelvbaobiao.html index 5edf342..c64107d 100644 --- a/build/classes/html/tick/zhunquelvbaobiao.html +++ b/build/classes/html/tick/zhunquelvbaobiao.html @@ -10,7 +10,7 @@
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/SatisfacTion.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/SatisfacTion.class index d51211e909c3305f408fb650619a2c73fa90aacd..9a1ad48a90ef8a38b68965408acdcd83a953675e 100644 GIT binary patch delta 14388 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 DL{@Q6 diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/TickingAction.class b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/com/hangxin/web/TickingAction.class index 5663fb6ade7a8763770c6fe7a0880132bca4751a..455d0a59cab443b209535116a1c0713945c75c4e 100644 GIT binary patch delta 3812 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 Li=<-x;KcU;CR)96 diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/anzhuangdan.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/anzhuangdan.html index 23ab652..60d5b88 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/anzhuangdan.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/anzhuangdan.html @@ -8,7 +8,7 @@
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancel.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancel.html index d723153..6c21480 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancel.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancel.html @@ -16,7 +16,7 @@ --> diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancellist.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancellist.html index 5029785..ee0de98 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancellist.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/cancellist.html @@ -8,7 +8,7 @@
@@ -78,6 +78,16 @@ return (2-0.2*value).toFixed(2); } } + + if(nianfen=='2023'){ + var row = e.row; + var value = row.noready; + if(value>=10){ + return 0; + }else{ + return (2-0.2*value).toFixed(2); + } + } /* if(parseFloat(value)>=parseFloat("90")){ return 3 ; }else if(parseFloat("80")<=parseFloat(value)        查询    diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/paigongdan.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/paigongdan.html index 15bd41e..65aea03 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/paigongdan.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/paigongdan.html @@ -8,7 +8,7 @@
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfac.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfac.html index cdcca48..750909e 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfac.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfac.html @@ -9,7 +9,7 @@ diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfaccount.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfaccount.html index a954c2d..d1a9fb6 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfaccount.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/satisfaccount.html @@ -8,7 +8,7 @@
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijiday.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijiday.html index 515d4e6..c239001 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijiday.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/shijiday.html @@ -21,6 +21,7 @@
+
diff --git a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/zhunquelvbaobiao.html b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/zhunquelvbaobiao.html index 5edf342..c64107d 100644 --- a/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/zhunquelvbaobiao.html +++ b/classes/artifacts/rushfee_Web_exploded/WEB-INF/classes/html/tick/zhunquelvbaobiao.html @@ -10,7 +10,7 @@
diff --git a/classes/artifacts/rushfee_Web_exploded/ptrun.ini b/classes/artifacts/rushfee_Web_exploded/ptrun.ini index efb0157..9a5751a 100644 --- a/classes/artifacts/rushfee_Web_exploded/ptrun.ini +++ b/classes/artifacts/rushfee_Web_exploded/ptrun.ini @@ -1,3 +1,3 @@ #save ini -#Wed Jan 18 20:08:06 CST 2023 +#Sun Mar 19 23:25:21 CST 2023 deploystamp=1612237236000 diff --git a/resource/html/tick/anzhuangdan.html b/resource/html/tick/anzhuangdan.html index 23ab652..60d5b88 100644 --- a/resource/html/tick/anzhuangdan.html +++ b/resource/html/tick/anzhuangdan.html @@ -8,7 +8,7 @@
diff --git a/resource/html/tick/cancel.html b/resource/html/tick/cancel.html index d723153..6c21480 100644 --- a/resource/html/tick/cancel.html +++ b/resource/html/tick/cancel.html @@ -16,7 +16,7 @@ --> diff --git a/resource/html/tick/cancellist.html b/resource/html/tick/cancellist.html index 5029785..ee0de98 100644 --- a/resource/html/tick/cancellist.html +++ b/resource/html/tick/cancellist.html @@ -8,7 +8,7 @@
@@ -78,6 +78,16 @@ return (2-0.2*value).toFixed(2); } } + + if(nianfen=='2023'){ + var row = e.row; + var value = row.noready; + if(value>=10){ + return 0; + }else{ + return (2-0.2*value).toFixed(2); + } + } /* if(parseFloat(value)>=parseFloat("90")){ return 3 ; }else if(parseFloat("80")<=parseFloat(value)        查询    diff --git a/resource/html/tick/paigongdan.html b/resource/html/tick/paigongdan.html index 15bd41e..65aea03 100644 --- a/resource/html/tick/paigongdan.html +++ b/resource/html/tick/paigongdan.html @@ -8,7 +8,7 @@
diff --git a/resource/html/tick/satisfac.html b/resource/html/tick/satisfac.html index cdcca48..750909e 100644 --- a/resource/html/tick/satisfac.html +++ b/resource/html/tick/satisfac.html @@ -9,7 +9,7 @@ diff --git a/resource/html/tick/satisfaccount.html b/resource/html/tick/satisfaccount.html index a954c2d..d1a9fb6 100644 --- a/resource/html/tick/satisfaccount.html +++ b/resource/html/tick/satisfaccount.html @@ -8,7 +8,7 @@
diff --git a/resource/html/tick/shijiday.html b/resource/html/tick/shijiday.html index 515d4e6..c239001 100644 --- a/resource/html/tick/shijiday.html +++ b/resource/html/tick/shijiday.html @@ -21,6 +21,7 @@
+
diff --git a/resource/html/tick/shijidayhlnew.html b/resource/html/tick/shijidayhlnew.html index a62bcb2..5dbe513 100644 --- a/resource/html/tick/shijidayhlnew.html +++ b/resource/html/tick/shijidayhlnew.html @@ -21,6 +21,7 @@
+
diff --git a/resource/html/tick/shijidaynew.html b/resource/html/tick/shijidaynew.html index ea8c945..c9c3967 100644 --- a/resource/html/tick/shijidaynew.html +++ b/resource/html/tick/shijidaynew.html @@ -21,6 +21,7 @@
+
diff --git a/resource/html/tick/zhunquelvbaobiao.html b/resource/html/tick/zhunquelvbaobiao.html index 5edf342..c64107d 100644 --- a/resource/html/tick/zhunquelvbaobiao.html +++ b/resource/html/tick/zhunquelvbaobiao.html @@ -10,7 +10,7 @@
diff --git a/src/com/hangxin/web/SatisfacTion.java b/src/com/hangxin/web/SatisfacTion.java index 8012abe..1a4a3fd 100644 --- a/src/com/hangxin/web/SatisfacTion.java +++ b/src/com/hangxin/web/SatisfacTion.java @@ -1517,6 +1517,9 @@ public List zql(Params params) { if (nianfen != null && "2022".equals(nianfen)) { denfensql = " case when paixu>pingjun then 3 when pingjun-paixu >10 then 0 else 3-(pingjun-paixu)*0.3 end as defen "; } + if (nianfen != null && "2023".equals(nianfen)) { + denfensql = " case when paixu>pingjun then 3 when pingjun-paixu >10 then 0 else 3-(pingjun-paixu)*0.3 end as defen "; + } else { denfensql = " case when paixu>0.75 then 5 when paixu<0.65 then 0 else 5-(0.75-paixu)*5*10 end defen "; } @@ -1742,7 +1745,7 @@ public List zql(Params params) { if (nianfen != null && "2019".equals(nianfen)) {//注销户评分 sqlString = sqlString + "case when paixu>=0.9 then 3 when paixu<0.8 then 0 else 3-(0.9-paixu)*20 end defen "; } - if(nianfen != null && "2022".equals(nianfen)){ + if(nianfen != null && "2022".equals(nianfen)&& "2023".equals(nianfen)){ sqlString = sqlString + " case when noready>10 then 0 else 2-0.2*noready end defen "; } else { @@ -2109,7 +2112,15 @@ public List zql(Params params) { + "left join(select org_id ,"; if (nianfen != null && "2019".equals(nianfen)) {//注销户评分 sqlString = sqlString + "case when paixu>=0.9 then 3 when paixu<0.8 then 0 else 3-(0.9-paixu)*20 end defen "; - } else { + }/* else { + sqlString = sqlString + " case when noready>10 then 0 else 5-0.5*noready end defen "; + }*/ + + + if(nianfen != null && "2022".equals(nianfen)&& "2023".equals(nianfen)){ + sqlString = sqlString + " case when noready>10 then 0 else 2-0.2*noready end defen "; + } + else { sqlString = sqlString + " case when noready>10 then 0 else 5-0.5*noready end defen "; } sqlString = sqlString + "from ( select l.org_id," diff --git a/src/com/hangxin/web/TickingAction.java b/src/com/hangxin/web/TickingAction.java index 1982dee..b1c3786 100644 --- a/src/com/hangxin/web/TickingAction.java +++ b/src/com/hangxin/web/TickingAction.java @@ -230,10 +230,20 @@ public class TickingAction { "and t.addtime=TO_DATE('"+searchbegindate+"','YYYY-MM-DD HH24:MI:SS') \n" + "group by rollup (a.operator) order by totalnum ";*/ - String sqlString=" select nvl(a.operator,'合计') operator ,sum(case when kpxm='税控技术维护服务费' or kpxm='增值税税控系统技术维护费' "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as totalnum, sum(case when a.source=1 then 1 else 0 end) source," + - " sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as xinxiang ,sum(case when kpxm='税控技术维护服务费' or kpxm='增值税税控系统技术维护费' "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end)+ sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as heji " + - "from einvoice_fpkjxx_fptxx t \n" + - "left join rush_log a \n" + + String sqlString=" select nvl(a.operator,'合计') operator ,sum(case when kphjje=280 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as totalnum, sum(case when a.source=1 then 1 else 0 end) source," + + " sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as xinxiang , sum(case " + + " when kphjje = 398 "+injfsql+ifmzsql+custtypesql+" then " + + " 1" + + " else" + + " 0" + + " end) as peixun,sum(case when kphjje=280 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end)+ sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) + sum(case" + + " when kphjje = 398 "+injfsql+ifmzsql+custtypesql+" then " + + " 1" + + " else " + + " 0" + + " end) as heji " + + "from einvoice_fpkjxx_fptxx t " + + "left join rush_log a " + "on to_char(to_date(a.operate_date,'yyyy-mm-dd HH24:MI:SS'),'yyyy-mm-dd') = to_char(t.addtime,'yyyy-mm-dd') "+ "left join rush_record b on a.obj_id = b.id \n" + "where a.action = 'rushfee' "+injfsql+ifmzsql+custtypesql +addString +"\n" + @@ -284,18 +294,28 @@ public class TickingAction { +" where a.USER_ID='"+userid+"') " ; if(null!=searchbegindate){ - String sqlString=" select nvl(a.operator,'合计') operator ,sum(case when kpxm='税控技术维护服务费' or kpxm='增值税税控系统技术维护费' "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as totalnum, sum(case when a.source=1 then 1 else 0 end) source," + - " sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as xinxiang ,sum(case when kpxm='税控技术维护服务费' or kpxm='增值税税控系统技术维护费' "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end)+ sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as heji " + - "from einvoice_fpkjxx_fptxx t \n" + - "left join rush_log a \n" + + String sqlString=" select nvl(a.operator,'合计') operator ,sum(case when kphjje=280 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as totalnum, sum(case when a.source=1 then 1 else 0 end) source," + + " sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) as xinxiang , sum(case" + + " when kphjje =398 "+injfsql+ifmzsql+custtypesql+" then" + + " 1" + + " else" + + " 0" + + " end) as peixun, sum(case when kphjje=280 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end)+ sum(case when kphjje=300 "+injfsql+ifmzsql+custtypesql+" then 1 else 0 end ) + sum(case" + + " when kphjje =398 "+injfsql+ifmzsql+custtypesql+" then" + + " 1" + + " else" + + " 0" + + " end) as heji " + + "from einvoice_fpkjxx_fptxx t " + + "left join rush_log a " + "on to_char(to_date(a.operate_date,'yyyy-mm-dd HH24:MI:SS'),'yyyy-mm-dd') = to_char(t.addtime,'yyyy-mm-dd') "+ - "left join rush_record b on a.obj_id = b.id \n" + - "where a.action = 'rushfee' "+injfsql+ifmzsql+custtypesql +addString +"\n" + + "left join rush_record b on a.obj_id = b.id " + + "where a.action = 'rushfee' "+injfsql+ifmzsql+custtypesql +addString +" " + " and ceil(((t.addtime - To_date(a.operate_date , 'yyyy-mm-dd hh24-mi-ss'))) * 24 * 60) >=-30 "+ - "and t.kplx = 0 \n" + - "and t.ghf_custid = b.customer_id \n" + - "and t.addtime=TO_DATE('"+searchbegindate+"','YYYY-MM-DD HH24:MI:SS') \n" + + "and t.kplx = 0 " + + "and t.ghf_custid = b.customer_id " + + "and t.addtime=TO_DATE('"+searchbegindate+"','YYYY-MM-DD HH24:MI:SS') " + "group by rollup (a.operator) order by heji "; System.out.println("-------------"+sqlString); return DbHelper.getDbService().queryPageMapList(sqlString, params); diff --git a/src/rush/UpdateExcustomerTime.java b/src/rush/UpdateExcustomerTime.java new file mode 100644 index 0000000..9f6b3e3 --- /dev/null +++ b/src/rush/UpdateExcustomerTime.java @@ -0,0 +1,48 @@ +package rush; + +import com.aisino.aosplus.core.dao.DbHelper; +import com.aisino.aosplus.plugin.job.BaseJob; +import com.aisino.aosplus.plugin.job.Job; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; + + + +@Job("0 26 23 * * ?") +public class UpdateExcustomerTime extends BaseJob { + @Override + public void execute() { + System.out.println("定时更新时间----"); + String sql=" select rn , to_char(to_date(operate_date,'yyyy-mm-dd hh24:mi:ss'),'yyyy/mm/dd hh24:mi:ss') operate_date,obj_id " + + " from (select ROW_NUMBER() OVER(PARTITION BY obj_id ORDER BY operate_date ) rn,operate_date,obj_id " + + " from rush_log where operate_date >'2023-01-01 00:00:00' and action='rushfee' and info in ('联系方式为空','联系方式异常','客户不在本单位') ) " + + " where rn = 1 "; + List list= DbHelper.getDbService().queryMapList(sql); + for(int i=0;i