From 47333265663079a710a9a33bd8025c0bdba1ae30 Mon Sep 17 00:00:00 2001 From: llllon Date: Mon, 15 Sep 2025 11:28:49 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=94=80=E5=94=AE=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=8E=BB=E6=8E=89=E7=9F=B3=E8=86=8F=E6=9D=BF?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=B1=87=E6=80=BB=EF=BC=8C=E5=9C=A8=E9=94=80?= =?UTF-8?q?=E5=94=AEBI=E6=B1=87=E6=80=BBsql=E5=A2=9E=E5=8A=A0=E7=9F=B3?= =?UTF-8?q?=E8=86=8F=E6=9D=BF=E7=B1=BB=E5=88=AB1=E6=B1=87=E6=80=BB=202?= =?UTF-8?q?=E3=80=81=E4=B8=80=E4=BD=93=E5=8C=96=E6=97=A5=E5=8D=95=E4=BB=B7?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=88=AB2=EF=BC=8C=E7=B1=BB?= =?UTF-8?q?=E5=88=AB3=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PurchaseDataSummaryServiceImpl.class | Bin 43317 -> 41103 bytes .../impl/PurchaseDataSyncServiceImpl.class | Bin 29639 -> 29603 bytes .../service/impl/SaleCountDimensionImpl.class | Bin 38023 -> 38970 bytes .../impl/SaleDataSummaryServiceImpl.class | Bin 42166 -> 42171 bytes .../impl/SaleDataSyncServiceImpl.class | Bin 26931 -> 26366 bytes .../compileJava/previous-compilation-data.bin | Bin 9396485 -> 9396485 bytes .../service/impl/SaleCountDimensionImpl.java | 32 +++++++++++++++--- .../impl/SaleDataSummaryServiceImpl.java | 7 ++-- .../service/impl/SaleDataSyncServiceImpl.java | 12 +++---- 9 files changed, 38 insertions(+), 13 deletions(-) diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.class index 945cc0b737a39c78dc828743a0dbd16cf1ee9cfd..4f7c119134af8ea7fc1997ee460addede30f101a 100644 GIT binary patch literal 41103 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
  • BGNddX;h|1icTGf4JIrQmM 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%0DbllY`NDZd$ppyix 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
    { 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 delta 7257 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 diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.class index 5aedc401f40aeded07027722d1acb5674fc26792..c3e325a2877411153bf20ae50f6d1649dcc6d64d 100644 GIT binary patch delta 3012 zcmc&!d3erO7Cz^FZ`6`BWU&tUG%7)&jkOVCNg_oo5fTyWD7CLK7|U0bL@ZI?P>Nbw zTT3VDXXyx{t=%YMZ>hB;BebYx(3&e|p3Xea%=64&{QkJ-x%ct*EX73|lm_(8AXmgeIZEno?~PG2o#CB4Ba z`V*_`Er#oD_R_zzkKScpy~k9&&opai=>ul!Lw8~?PY)*`4tPi)UXn-@mn3*eSCo)$ zC@F(bN~Tzw22aUA8JQ0sSpi?!1V8x-m1PfFNFJi(I-=#CwU6x8JrJutXr-0VS{tE_ zMj=k)&{jL6o%TR`eH$HgIN~(}9o1#ibgo1vU60P1gG4=mB%6B|n_{xwMpr0O;Dv6e zgzgAN57b95#G*Hn@s?ft+O$o{5xPzVp)u${Px(zu24xQ$nF$9Cgq zG{aqVwEGm?xBYm4xp)W{9%BK1!7BXf`a^24J7efWeg%%cgpe&GZbL>s7YU zJB$VxgK~^T4YooATO*NeFoJOy$F`Wj4tSUGc#j>if(cm9PS|1hdzpx%Ou}O(;|Ws; zc4HZKFOprpl#?Lwc27xdTg=(V*5EB$gSW+x10s+Ai`M!4HLha2(I?%}vbQBls6fV(OT&j!tp?<<;`WG(O-CUu^xKc0hBRfG>=@YI- z8LmMf*P=exA(o#YnV(`1*JC0#Ad{cj8vGeQ-KWRrcsTcp7xzhN9u$8bk{bNR3L?)ICF?; zk0)g$Pst>nmT5dAnLI0h;yGEu@8x5jm-W0L8+lQ3ctv*esvPEZ$z!3M;0^hfH{}v< z$#veBCw!oOe5h6UNUQR(HgNJ+ZE95CG|+fsbhz=*ai*BgFfZv^Q(Uu63C%Gjb+0L< z2aKm4GTwU1l-5F1Mjsd-i1CG&@kd2d89^ohb&Uh9OjRVBV2n03Fv-+JnyG~)CKRho zZG2{4!xr;8_LwjnGj-7PqN$4lQxApa4g74vsiqOjmwizJz3 z>212Xnx$>jYOcF!aT@6I&h&RBrPtI~TvO6p!uYrjq=)M}t`4&TT!AwZy(WmEoratw zbveORW$pmik26Abd=afqMjajJ%AW0TP0OgJm5Mm~GdjP_a+Xxyk}6nIxgyg1nIT}= zBG&1dVW3|Tt=6n+`n9Ev_R6)xcc&e?U)srl(QOtVtrd$x_|Hl7 gDr@oOEWW(Omo36yoD-`479Xp=Pkp<`WR~{$2joSmhyVZp delta 2030 zcmW-hd3=vo8pWS;&Km?lMC`SOgbEFUB!rB$GmN5%qE)FdS`1^EQYAyI5rP+E2DOxm zsg9VRE@bS)UP~-Pb*Sw#DvV-OE!8`}zn=Hr_xaxYIp_1-vpt`)HZuREhD2q*cEhTE zyRI?*Z=*N6S}TA?l~m3i_vzfdbH~@~bn4%`R}=r0uFd?E*rmb$*PFi9GIO(?M!wy~ z7JKCCQv?u#t*D4EPy=5f8Qbs{wqqy?Fbe;~1nj_6>_j$p!N+cVhCQxxulw4EBiN5K zIDl&?#C;qjaEKLfn6+_)FXJc^aEx7WoPBVD@8BfI;S^`4p@_?Hh8u8>0i5S9{ELTi zkvH%Sf50U^$F~Z_WkukMYT!H7!gV#o4JF{F2H}ndCKc3s0_}PZzg-vsH7R|C5VoO-U*07{~&Qi9Q;a14TcA78S zZ8ot-u0CZ`gs>SZG7dG^9Eog!j%^x|X3+#YvOu>ErieN{Eu@h^sGh^6=@$AN~e3kv!o$2hs48Fz@?8Qv><|l4#}aLFO^t$}+<$a)?#uFpJ{5)`TMi(IXln zb*z!&tpq1nC4OKnILSJ2vi+JaF&hd411q5EsL`) zmvd}6vu%Ux`^@#_bADj$$fe3$>~39R<+;ov_*aYOa%;s^mcSL3#Ff^cAK6=6>yG@` z#&Mm^=6dJ)W?RO5cia|R&3{-P1Ga_RZ9fa_GI!W5?zCbz6UIFVaAL6**xqra9 zU+COFhygr=A#P^I4dfAI@hBGY7}oGO^7%D(@r0Yalg{~5xXIIaz%vYSzJ>7|EARrV z@**4X8|VHdcHp

    x&$~%N)WhT)?aJd7VpngX?+IZ!{q$&~D5VFO$Vi=p85Yo)dcC z34P#%{^*20bVC2hwMtu_%GefFwEc>(%ZjvH zs%*uo0#h}Fsybrau*az;67>=~x}oo`+8CfZ7^1q!9H)B7Qhh8^6xOH#^4*KrrDz;g z3@)gVdl`-KKut)+vWl9qk>Z%7=1fxy{y{A{QStmxZ8%*CT&P5@Q4%+)EqA*0K_&B) z+Vh!G_(B~;byB!G2gmF`R>h*Nd?0>8j}n=`v9juJ<<-+Fsh7p5x3yN9C903L)$2Au zsWwpkY_R&ZSytARw>;AddGHagzeKvE7b4ps76_lM%yL*(eCMeglHnl z>jPBOBt&a6UeOfvR3_fgpOCJpcrR1aFjiTZrs>Gh3@q17{LLl6HqFKX%|Vf}U1H32 z2{8{ZG@s$hWqmDRycV*n7O|gv4%cE%))MAwsq^5^3}_h(^cUyD3KnW5i}Vq%X%+8k zwM;7&s3j52F-GeSCh9Kc=)cI*J#5hrD3Hr# zJ-`t?#Bu$I^Lp&!@+Umj6PlhfOwU=}3t_ZZk}bSaeANqOnpc72y>L$PDsq+=!4+O4 z*L#)ucdrV+^s2JZtHvU)I@^Ee)!;3!CX2l~eCX8`ym|`v>Z_&~rKWD(+H0s3FIv64 z7!7lEq}N!Zy(Sv##VX5d8pxX2(TieDhrBZgkX!Aa!>^EItWBaSNMcU67f+Fbd^@%%O#8 iVWk~Y#xZ3bQ#!~jUKESaAaj0EbCmo)6KL#L2>Aujksz}G diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.class index e680d44b9c77c9796a3ea586b08660fb7d5dcabf..6c02ae5514bc8188993e5ac8313529e53e85018a 100644 GIT binary patch delta 24 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 NJ-XGSJ3RXQ{{i0kM&AGc delta 7101 zcma)B33yf2wO+%$Is4vwGM!9ZG64Yu0)!9;`gF_fd3Zb z_xbM*|06~&e-NWb_`?`i@kf???C`-DW%4HuAF|I+9sZ}`&+G)BNBLj;g`MxP;Uj2C z@P`h68O1_h*>%5m_#4CDI{a_L-$ki_k4CAOk6DJ}hQBv_!thDMrwpGqLPppTiBcDS z(}-e_grX9b6eCVdj6{q?V^k?IM_l_%HIilrrAH}?-@=-b5lv7($#lev;+bVhHa0Ce zwlmjAo*mx8zQiqQiKQgpk^)BxjTA*`xD*>{Wmjz-lQvQk<0aBI$}^;$k@lAREX&xz zNJo!YI@|6p*tT?aq|8V+tY0VPM!MUf6;Z0=qegl-Jk`$J(@3R}UXWI*9O)gUx%?)G zR2%7Iq_2^FM*2H4z{o%&gN)P|8Ej;Tk)cM;HZsgA{A(k_?c5`bjI_M99*K-LGRBHE z)<|NUk?}?*c%(APqmXnqGTBI-BU3yIOXn!vAk&OYw?fP?GSj0JG|Ft5W2D|A$1)k2 zWLxGLneS0VCOLAxkqe@9yVcDCyU;?b*$bm|mn<@Jkt2&O#B@sn{a6 zn=QG;zTS#HS!LulBdcxW8cWtXvJUINAjMIT+an9@Blmg~) zDkFa}@>h?%q*>qdpc(kU-;BH;mA}hBtZRQ@ z19DpN=7u>rsjS(Y<6oTH!u(6Va5=`Ve|v68?650G_!?Kfl&}1kb90A%ogv?(r^vS% zyw{a~%Xf|(b>)~GcjS9lPRL27)P?nz*Oy(kY{8&#S-G zuH44e5^d{pDyO-8318|Th>vW6<-vOeU+MBF9_?y7ZSU$?+TI_~vggojzJ@8f96wz~ zkM1&Wo~s?SqobW%E!EDhcG0e`mZ`^-d2r)12iH9P@h<iU=Dx6vx??QhEOlTxjH zn4peWUf9*X+OOg3{0^L3WX00*eweYpdPWD>nFspih533bukyzh#v_AlQ-;wR|B}Kh z+Yfd*TZb@(C)LzU8{+CvO~cEmA$T!*wxh#b9j+t%^rD)`NTap(ZInN)sEkMZtBNj9 zy_s)ub&OTaSRLo57Ejah+Qwg4+-mS9z7rGG&%0>BVn-*qI#DONdX7#`Ptm#z{*B8o z>l9a~%2%#V)9F9*xQX+ZxjF-mysx-rCamDPI#XvkI@@k)j(@cHit>6_&(*oE&eQp> zo~Q7(3+(H7U4W<QYyi>1Eav(0#dHx?Gs^C$kWHhcAYIqheb)Fy6l`8mDO)thvM%iFcLt1EQ{Q)KGUK@&!g z9W!aT(VH#TEleTX2E7H%u;h?IQ<+jeeR=aIx2|SNKlIRwPak>allvMDtz38To>wq_ zRLyK;gPc#Fz5bJRPbIrQ+Hv!t8(#{#BX;P3#aWZ%!R5o$E zB|xF^Q-|S^^6`r8AHBHA-%>I;X7pB9SLtm=SNqa-Kx~bxYjvHgx9fU;RNKnf23LLS z!gs(u*0ik)ZDgu|54ZDE+pW?~dZ)joT^GKq;n(dJg>|!TY3NltHWd0PQX#LoWZ?dd;tRum6Y2p8QBdO0T;)^e9t1 z|Myiz{%cj;5*(!vwX|6e#aK%l%)v7qPv#6@;Y_r9oOR}%E~HFgBu&sDM4cqw*YpN131nt@y49b1(+Dj4NH3)<~;wJ>bVI!@G1;#AcqUN2|wZlQVHp3fpft7#5*KyQTVXd`#z&J@P1 zUp6jmQ5SF^3DT$BmCHz|2ff7IxSTY>-7&NW7?KlLVB+K?wk^q8(Zt%biM0|bz8Crv zFhvX!cIOIB9b($tp%%O!2<)As)=1`_XS!iMV;3}fibQVU_!h-*6n18HKQ40({ z4z=~hV#3u>BhCP8gNCxcBdija_wxfKK1dm~muk5m_op=aidyjis3aYVuR5a$AgfM> zs>^vGdWF)s6AuDX%H=j(0~DenZpnjz!qgrvFa#)tx^k3<0y$L4!e;{+>QBdc7*M1y z4TFxY^`f+vp5Wooc8ngUbv%Mc!j4bUYOV!J4U}!&A~~u8B~34XZ~u`Fjt%P?4J`&d z8Roo(*N4=J-4wq@UFb%d%44uh4sD>3JQj23%4w*798jUQZ$cB{H{;>KMS2yb@C0~9 zs=P|Oc_MfVvD z8W$-DSD#rVbVK7JEkj2e7s=N<__^dFbSyNMr|?whHxwEIg=A44r-yn&Az9QSJQykn zM5XsbOL!W@&!Nh2HBaZnEJR$ta0SoCK#wMc3wRDB%%Vl%5Z9wEJA4@&%0@~i!tk~; zMh3DbLu>+B(@KD>X*EFS!V;kX%>{y!W1KZ@N`S2G9E%cx5161aurg`*7M=$Qqm&X} z!SjJ)6bawJ=K;Coh7)`~UjX0B3oqjZyb!+ECcJwhs~^#5ux{@jrro3;9zM$T#Wx}kPZvp2uCwrBI#Rkb~e8&@Pmd2w!I#9oY8MV(~5 z+doh{EMb#muGKoL#CT-XQsj;J=+Yo>Oh6<@s24BClwm5Q z621!dOrfEa9XOZGg43FWm=<`26=GVDU*KFoHq7B%KsL-nffx~z?`SYIVNVRym7wOeXJ@ z_{KyTXcghtkHgOWd&iZuwOdb~l%>JC6mTm+7-p2BL0!E_OljIHkr=j z+u$TF?Z&M~^1vKPxA1CSgSf1u2ZL-9g`;_Alm@gG5@WYO)|sGEAe-wIR!a-=dI<8z zcpcm`3|;(-*JE4?b)bI+$<;ZVy3q%`0n!<&p!eAaiUcaKo@=LD%Zr+psK64*>F#Kn zt^$d(mp^*q*^O%1h<&044)*!*#L0qvet*v4ApK_`6dph@+{K$I73F}-TOey1twhND z6v(BM$jo>1Jvhhmn^5N_RMmuroIzC2A-)&9F?y9A;`_ks(muM2?*~d{cuI1<1kzRo z)cODhj>l)sgZvPjXex5+!(fi`KHTb9v7-DgSgcqvewKy>VnwKokMSdDOQ9-0!jA$u zG>AXptw2URZ0Rwe2(=dpA{{{{UCx*Z=y4vi#wrmoX(uD?_z75Bo4hUA2L%WI@-5|@ zqzs1&f(m4AP+Opq391X*=2uP`0DAe9?x2rP=>)oeO7|ZZ7e9j`p5&(jLljNzXbmxZ z`n!R{9m1g%ZA=m#YQt_pY-aHYS|1b~a3{Es+!emml zsVFIO1troNCxPEKPST@sk}f!H@M#&aRwfO>>Et#m1(9yfl!CT4Y^no+Z4Eev(*9Go zHKi>Xv;4bf7Nq`&(|>(t-~Z8)Hmk$nAC0lI3x%4`-n@={2ByX*87OkHnTegDL=TPd zm(SW+C?C8?GW7-0>hySICk`p9&WLC1L_Vg?(lB=R3{H4Q;+bCQcABxBR&J)Q-j{g& zD*3vFJn!otUN=)l-1ENjzS&OC)@`Ly@7v~_1>V1#4^91HsP}gBaU0O_-F7Oe&H^~P zJpq&*Pff~}6VFM?Mi*I>!SqWisLqY&ddDnBUOa0DJ-wNV<3QW#`OTDrIgX?IIJ%Qk zmB+K2#$^A8F;=$Y-uD4R`_t><>2Yr-EfuQUdUE{^DvyWb>E69N=)RqFe~9XyrLcFx ze{)U^pYXl^c)c&GrUVu(>o@GPqH->H8kQ7*%@yUf-KS)@H=mG+c7 zw6{E@)$*kFk>|Cq?ALyBK>N#K9iXfOaa}M7H#LKC`7#urjl*y?G8{c4aWzn@vvia$ z$MZT|S!}?K#YP>cTXcf%#O=hZI!WKa1;u`ytY2uIp4KU$jD$`Or zXN0=z%+O#whwE%x+VEs*!*3#)HXt%_yN_c2Ih>@qd;szKJkmrSe?)zGJ9=C2XE?22 zKwF#_qq^RKwrn{-6L=?3p6sXTybF<@D^Jo&ei3bnEO{PZhQF`_>2n!}ux~>ieJE4; zWgLi^^qRcIuiz+4*A0yozN242Ae*`K^i`U~zXZzEH*l=myzc3Ks^Q&e%hH`RGgvMo zRMeQC@L3faaVCiX4NhPnYzJt|Yn-b-N~j#50-E%;)HQDLZa@WtR#bts+pU?ZtitEc!ipfsEbJ&El3o7`mu zO7G-!i*Uvy87i6>D!_mO1^K+lpE+o-3eLEHxB>%s)sJa<{<67{T-!F8WuZ8vZkQ{=$Fd|B_Cq-b({IDxebsdQL#6&Ilf}0(x#h=LYn=|DM-apq~RFSaU2=QgbGSmURG}J|aRoZ)VZc>fLk*0m zMIGvK9XD_j4QPZ3O}K^IXvQ7fMGIQdhIVwI6J~Uw8y4I{4|>su`*?tU4B#QGcmx{; z@fc4qgr|6h=Ximacm+FNV;CcN0|%UNVH9I<<1IXR2QS7kfl0i_2l&E~;75JxHaNLeXYZ$AIIrGNe5m16$a zUz=So^t{oDN%>zgOf!4RfZuCc+pbyg8*^+JMU6JKL+#l9_wK8GNR}p;r9@rx`}mzr zw{^L{-E-Z(ER%%HRjG7uA$xAY(YV&F`Sj9akXsFM8TLN_1(Y}l4|u{0DtJQ;ANb-B z1o*)p0SH78f^irj2t^peaRf(k495|HNSwe)Xb^>H#2^-@5Qli2h877pgR@9PlG7kh zu6!%heXseWD&GC}!^8HuWYoQAbVWT!*$f70XNVH1Deo`n`l8R+R%;;7}1F?bfX8o zxP?C4#vR;6Kknf^9^fGcV8SB|;xV3J2xbgp1f#HE3?jy1#RMiHVG7fD>U7OMD{%e? D2z^U_ diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.java index d4bf2c0..56015fb 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleCountDimensionImpl.java @@ -409,11 +409,23 @@ public class SaleCountDimensionImpl implements DataSummaryService { (existing, replacement) -> existing )); - String querySql = "SELECT DZRQ,QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, SUM(ZSSL) AS XL," + + String querySql = "SELECT DZRQ,QYGS, KCZZ, " + + " CASE " + + " WHEN BKGS = '龙牌' AND LB_1 IN ('装饰石膏板', '鲁班装饰万能板', '石膏板') THEN '石膏板'" + + " WHEN BKGS = '泰山石膏' AND LB_1 IN ('装饰板', '石膏板') THEN '石膏板'" + + " ELSE LB_1" + + " END AS LB_1," + + " LB_2, LB_3, SQ, CS, QY, SUM(ZSSL) AS XL," + " SUM(SSJERMB) AS XE, SUM(XSSL) AS TSXL, SUM(NMNY) AS BHSXE,YEARMONTH" + " FROM " + SALES_DETAIL_TABLE + " WHERE DZRQ >= ? AND DZRQ < ? AND BKGS = ?" + - " GROUP BY QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, YEARMONTH"; + " GROUP BY QYGS, KCZZ, " + + " CASE " + + " WHEN BKGS = '龙牌' AND LB_1 IN ('装饰石膏板', '鲁班装饰万能板', '石膏板') THEN '石膏板'" + + " WHEN BKGS = '泰山石膏' AND LB_1 IN ('装饰板', '石膏板') THEN '石膏板'" + + " ELSE LB_1" + + " END" + + " LB_2, LB_3, SQ, CS, QY, YEARMONTH"; // String querySql = "SELECT t1.DZRQ, t1.QYGS, t1.KCZZ, t1.LB_1, t1.LB_2, t1.LB_3, t1.SQ, t1.CS, t1.QY," + // " SUM(t1.ZSSL) AS XL, SUM(t1.SSJERMB) AS XE, SUM(t1.XSSL) AS TSXL, SUM(t1.NMNY) AS BHSXE," + @@ -526,10 +538,22 @@ public class SaleCountDimensionImpl implements DataSummaryService { (existing, replacement) -> existing )); - String querySql = "SELECT DZRQ, QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, SUM(NMNY) as BHSYYSR, SUM(SSJERMB) AS YYSR, YEARMONTH" + + String querySql = "SELECT DZRQ, QYGS, KCZZ, " + + " CASE " + + " WHEN BKGS = '龙牌' AND LB_1 IN ('装饰石膏板', '鲁班装饰万能板', '石膏板') THEN '石膏板'" + + " WHEN BKGS = '泰山石膏' AND LB_1 IN ('装饰板', '石膏板') THEN '石膏板'" + + " ELSE LB_1" + + " END AS LB_1," + + " LB_2, LB_3, SQ, CS, QY, SUM(NMNY) as BHSYYSR, SUM(SSJERMB) AS YYSR, YEARMONTH" + " FROM " + SALES_DETAIL_TABLE + " WHERE DZRQ >= ? AND DZRQ < ? AND BKGS = ?" + - " GROUP BY QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, YEARMONTH"; + " GROUP BY QYGS, KCZZ, " + + " CASE " + + " WHEN BKGS = '龙牌' AND LB_1 IN ('装饰石膏板', '鲁班装饰万能板', '石膏板') THEN '石膏板'" + + " WHEN BKGS = '泰山石膏' AND LB_1 IN ('装饰板', '石膏板') THEN '石膏板'" + + " ELSE LB_1" + + " END AS LB_1," + + " LB_2, LB_3, SQ, CS, QY, YEARMONTH"; // String querySql = "SELECT curr.DZRQ,curr.QYGS,curr.KCZZ,curr.LB_1,curr.LB_2,curr.LB_3,curr.SQ,curr.CS,curr.QY," + // " curr.YEARMONTH,curr.BHSYYSR,curr.YYSR,COALESCE(prev.BHSYYSR, 0) AS QNTQBHSYYSR,COALESCE(prev.YYSR, 0) AS QNTQYYSR" + diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java index b13d523..e6b4061 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSummaryServiceImpl.java @@ -186,10 +186,10 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { String abbreviation = SaleUtil.getProvinceAbbreviation(key); String sfSql = sfMap.get(key); - String sql = "SELECT DZRQ,LB_1,LB_2,BKGS,SQ,CS,SUM(XSSL) AS tssales, SUM(ZSSL) AS lpsales,SUM(SSJERMB) AS revenue" + + String sql = "SELECT DZRQ,LB_1,LB_2,LB_3,BKGS,SQ,CS,SUM(XSSL) AS tssales, SUM(ZSSL) AS lpsales,SUM(SSJERMB) AS revenue" + " FROM " +SALES_DETAIL_TABLE+ " WHERE LB_1 IN ('石膏板', '轻钢龙骨', '涂料') AND ("+sfSql+")" + - " GROUP BY DZRQ,LB_1,BKGS,CS ORDER BY DZRQ"; + " GROUP BY DZRQ,LB_1,LB_2,LB_3,BKGS,CS ORDER BY DZRQ"; List maps = DBSql.getMaps(sql); if (maps!=null){ @@ -204,6 +204,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { String bkgs1 = map.getString("BKGS"); String lb_1 = map.getString("LB_1"); String lb_2 = map.getString("LB_2"); + String lb_3 = map.getString("LB_3"); String dzrq = map.getString("DZRQ"); BO priceBO = new BO(); @@ -246,7 +247,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { priceBO.set("REVENUE_AMOUNT", revenue.setScale(2, RoundingMode.HALF_UP)); priceBO.set("UNIT_PRICE", unitPrice.setScale(2, RoundingMode.HALF_UP)); priceBO.set("SHENGQU", abbreviation);//省区 - String[] gzjzStrings = SaleUtil.matchSingleField(bkgs, lb_1, lb_2, gzjzList, "其他", "其他","其他"); + String[] gzjzStrings = SaleUtil.matchSingleField(bkgs, lb_1, lb_2,lb_3, gzjzList, "其他", "其他","其他"); priceBO.set("MC_JC", gzjzStrings[1]);//面材/基材 priceBO.set("JZ_GZ", gzjzStrings[0]);//家装/工装 priceBO.set("PROD_CAT", gzjzStrings[2]);//产品类型 diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java index d71c784..8827e29 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java @@ -814,12 +814,12 @@ public class SaleDataSyncServiceImpl implements DataSyncService { } } //修改产量类型1 - if ("龙牌".equals(map.getString("BKGS")) - && ("装饰石膏板".equals(map.getString("LB_1")) || "鲁班装饰万能板".equals(map.getString("LB_1")))){ - bo.set("LB_1","石膏板"); - } else if ("泰山石膏".equals(map.getString("BKGS")) && ("装饰板".equals(map.getString("LB_1")))) { - bo.set("LB_1","石膏板"); - } +// if ("龙牌".equals(map.getString("BKGS")) +// && ("装饰石膏板".equals(map.getString("LB_1")) || "鲁班装饰万能板".equals(map.getString("LB_1")))){ +// bo.set("LB_1","石膏板"); +// } else if ("泰山石膏".equals(map.getString("BKGS")) && ("装饰板".equals(map.getString("LB_1")))) { +// bo.set("LB_1","石膏板"); +// } // LOGGER.info("泰山应收的数据:{}",bo.toJSONObject()); bos.add(bo); }