From cb42eb80cd6174f05dd43aa590cbc958c529a3b2 Mon Sep 17 00:00:00 2001 From: llllon Date: Fri, 12 Sep 2025 17:01:51 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=87=87=E8=B4=ADsql=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=202=E3=80=81=E9=94=80=E5=94=AE=E5=A2=9E=E5=8A=A0sum?= =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E9=87=91=E9=A2=9D=203=E3=80=81?= =?UTF-8?q?=E4=B8=80=E4=BD=93=E5=8C=96=E5=A2=9E=E5=8A=A0=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E3=80=81=E6=9C=88=E6=97=AC=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=8B=BC?= =?UTF-8?q?=E6=8E=A5=E6=9D=A1=E4=BB=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PurchaseDataSummaryServiceImpl.class | Bin 43485 -> 43359 bytes .../service/impl/SaleCountDimensionImpl.class | Bin 39601 -> 39422 bytes .../impl/SaleDataSummaryServiceImpl.class | Bin 41942 -> 41966 bytes .../impl/SaleDataSyncServiceImpl.class | Bin 26199 -> 26491 bytes .../compileJava/previous-compilation-data.bin | Bin 9392561 -> 9392561 bytes .../impl/PurchaseDataSummaryServiceImpl.java | 33 +++++------------- .../service/impl/SaleCountDimensionImpl.java | 11 ++---- .../impl/SaleDataSummaryServiceImpl.java | 19 ++++++---- .../service/impl/SaleDataSyncServiceImpl.java | 20 +++++++++-- .../apps/bnbm/datalinkup/util/SaleUtil.java | 20 +++++++++++ 10 files changed, 60 insertions(+), 43 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 e542fe3fb2be6a2cbf57adc981a18a7cf5f82fce..07ee1815c8880c57b76c9b6cb4bc353d35e3b412 100644 GIT binary patch delta 10785 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 N?sKQO&yRHS{{e>!($fF{ 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 fec43e88c9a533c4ed9715ced9e8e272781f3456..b1d120d4ef2889c065ee9543c54a4677369a2063 100644 GIT binary patch delta 14547 zcmb_j2Vhi1^PlqWZgaULmrK0_0wmOgA{{~%i1ZqfB31e)U5ZFKilA6PeSn~#AS&3! zNN6e|0*WY#SU^EUK)`~Ejhg@LdoPy+v3=hkbNlw~+nwE=o%!v|?7D6}UCyJ>?#r8B z1AzKQH7}IMa|+LUp(S4M!ZN%V0qJ;2;pIpyAn?LrLYq7)CMdZ7%JQdHVQX^P5t zsH_Zy%6YL4rF$uZ$}6hirHWKZQDxnvilR(io~5X2B+jO40YIu1Nwuj?0Eij{fOTR} zQ!h26=K9069%`YeWynLVywDKO>1H{RIESv&NoxgR=()L+p6 zMFY*-uwF<8Koj&RF6!JwFHNG!I(Ms=rqFE)n<<*=rD-%hl4ejy(M&z(S&C*Wnxp7; z&6~N3<|(>E(VdFs%UtlHqPskFw-;vPxd6B{YiH90J+gZhEzpD(M#5cmpNH-b>C6K< zF%>ORv{=y+J;w(XE!C|iDq7~Hhv;ElxI6%EYM?pzsOIHL53LG-hgK_kJOD~_IYK91 zYO4Es+C$Ii**>f2IYrMadcjLC(mI9B6}_Y=PtnVYLhBXfE7}l%NU9Y8pKc$elW1zH z=oLk;Dtb-PRz9zZ=(7O$b?33V-+)fybmvDDeW~cEqOTMkQ*>Nm zBSj|^eeI!>BI0;XOWi3g*ryeJqv%_m{Z7&My8KKeuBRUq{TP6F3Mx9Q=x1I2i=tl@ z{T6@(-D4t!q_-s9WimAlK#(pex~!-`X2Qb93`WJIm=zm}U5ed`J&IKTQgriF-LRBS zO6%5X(wd_c$A}QI-`!kPTmMrWt2m%IPI0{A1jUJplN2Y5MsZN&FN#wFqH;p7tR_`X zC+V7AhNf3maXH25iZc|KS6so1+qq%@%G0F)RM1r`(&_+I(z(hysUoc7YKp5XuAymP zqm!CCsinBK;yQ}!1|XAyS{r(J)1f@q7X{%4iW_=4n;Ut!vEn9ra6+h=hnt)GjOBQ( zImT5ATbTE_QZOfPjjN2y)6&DO5K5cRCzQ@R?cI!OAwqEUkjY)lm2nB?HeWgOd*2Xm z#JGt=#!tx|H?o%5HR?Vi$HUj<9glJ&w$A%DdY>oQ2|FVgE!wxv^>G{g$j5EDoevvg zw)sh7J%4*2cfjX;+>tx^xHES$OD8o@U35uT?q>E)O3KRR>wVl^f4+fx__!zc@^Np; z;nO(ChmY#ycAeaWgUm;hs&f~<(R@FtqdfbVWs{RD_2qsD{uX1#Ot@vj_<>_P4w*1~ z%-~yM+}vOB03Q$3L+Zdcnf;T?a3^`rNwTzFmqC{qI^y>!F=M8Jj&cys(zQzJVq#v_47D+jQ8UqAK$_gJUr3IlX$Y9Z>El^E+sAYGcC%UOw*I+1&&PKNxA;z;kC0_{4P=?y zOSe*Y@!dYo<$KJSv`lp`kMr>YzSX=oty$VaJz46}%E$NVoYA#quN)uW&kyLao8}{F zPu5+e>o4Xd9)8frOL>`(AL55Syxhkt_z?uxz`>(NjP~%OK3>VIJp7oCSM%fMlroy5 zH=A#ldDYz-+aNSH$JI;Dd%WyXc0b|cCwaPgPx(@64X^d_Q~b2~V)?3}XZTqkKgZ9@ zIC|ywZja!*Hh0R9f#ds+8Z&yra0IO8!v*|;WU9(fB=JQbuj7||oX0NRirAtsuuDvgfI?cT9+r;eR^RVjOIZrK)Xa(m`fHJ4Rg zYCcza!HswETZ-S-!`dz6JGAIu%YM|BWoel!N!MNo5nn%=cXHms6Dzj*_#GZ6r9Gv8 zH*tsQ zuhE5H!Hwpi8X0Ooi(G$y1BlGI`T!Y9IhBrm$=X7qn4)sD*VEBPH$eB9hy zInjK*vdcVMt23YA*Yk2}SH!fh`J|6eaSy3|mr46?tgMnu6Mx~I<$&K=n&FYP- zqha=K+{|zxR4`{XN;I1^iOJj1c%BR0c^z83gpp!^r5j>^r5h1uM60J0!~#nbVo$kL63yj9oTivC2MPtr-U zPJ($=+B8Ogiq4CfmTr{NN$I?aZKorqnP=M_h%BQ^%Ic(?`AK^-lrC#!RP-2?d`4xX ziVuGg?7^P}Y49u_^x;o}F8HHXq#tzI8GPS|--{mLce>uUy6hWW@3gLWN|&9~Wnb&E z6T0lUE<2{nzS3n!b=jA??1(P=qJ}O!tP4Nag`erd1G?-JUAA9$yib?y)g8Zsd(7mH zRWK{BMaKy+=*0UY9FB|}NkP013yjPcR zvbRavMQYaofiQWxGB*IOlMG>3N!?aqDeNYBpIrfS@p^ef?2b3sjqy7$zy)Bo>v93R zn%8xm(^=PV10HA!ZLkOSl_@UY7Qwag11- z3!yoVl`>KL<*c9bU!V1v-iPgHLG^D{w?|d7r~3?p;;YSf3c6Ol^@V^zpQ*- z-9A~UmtGbvLnJI{ExiGKpt`m6296R5(+eJpgP{!0l_m9KUFd2pcogQqwblwmV^!#F zEx3f1iAfqouIalC%U`1q-dgB+}C`&yvU_0hb|ozm`7k z1a1NIM0#c48G5jT()Gcn+(9_T1XVZ;zllp z!t8h$g3d^1g-5zPJkk~6fzFVD+Cvd3)e3blEtXnhG8~D~ z0#o8oi>yea7Fw`ZmlYddw5lb!gmMGV^dI*VTlxSotMu{%Y16_hFOJC*`zyXN+ z2i@sj>>gQ@$43P73SjjgX4TH=yu`FD4srOI~uEju9jH=TT()Z8A7)6J?nWaY6%s0SkgJM@1WVP|%{)Y=t{=UTd6 zutjX(tzf)izr+UK4#vCeyb8wV!^j?ME?*y1`7r7sXtEK;1$GBj;FgUrVG~R=Als|w z^^UoEP!{cRoA>vOH>3Nc#WdhXkSa!z>{k+kYGK9>ULU#%H_&8!h34ZnT8wYdD%?)b z;7;0wyXZrFi@w0O=^NZlXYn2S72gw_-pjH0J~zNmxDkHHO>n>Xbsuqmc@D;pc^H0b z?SU6X)USd#)G)l+3>5%a84|Vg;TQp~Rg#MmNS}(2NiG^^iCXD>Cq`go1g@5xA59!! z??AK|`r+gFgv1zDK{tF-a&fc^s^S_!l6ct`msoHW$+1w$LI^LWQfUVvn&Np}s}TYg zQ)sodv&arBV4-&w7wn|*_>^?#7FBIx;h%?_6hnjIVKf+Cxc~C-FdF0(Lj&1?oNl$c z+uhEvy4Agg^u8Xlx}7QA+MPN24zELGF@1LgS+bu9n@0z zuGTJm&s@;6EbcX5=vkWH_gE5HFrad^4*)hnO@hs^4f#1mf_cipvlW;Shl33tLxC2kaU3dl- z;}5V3e}wh;6TE>JM0x=B5yCe_@T)v8kby38VSqd$3ktI-0$Y+7J5VHcCm;5sP!tZM zXdFu-=_E2vvG^DT@L7t(Efg=Rmw*Q-5x=4&{E3nYDM(S2LaFj!WhzB=DUDiF8R|u4 zsV`;G5UNVUsRoUuYiJJDl*u)q=co?7AT?j3dh~%jKc@P0fErqgdN>4$SJl*1M^j_P zo=&&aGZH&s&{9vI*tC9JDOwVR{m^46YBUam%lM3?vSZ;FOHuvQS0w*gDT~Ey%(9fy zOLH8hjKEY}h#_m=7F|pzR7LSj990y5#8E|j!B$0jp-2_!V4*5X&e@nHXB(Fpw4s

$M3O-f;hg0$zex+v+Pozs{x??UTh6)vjXg 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 Mjku~XM>neXe@tTYc>n+a delta 14663 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 PEAPt6uVm%jSvmASRy4u7 delta 1774 zcmXw4dwf&X9Y5!Of5|;fPm`FA7HFF$eT72Pv=s!01JX2f#dP#VCj|_d?VvQ2LIYSH z;$8|W7Ccic8v_KD)#<2lZZHrZ+i=V|m`*pRZc{<_P`gc?V?K6nK63x~{vPN4e&^it z`~H6Som0k(rwqsGPmVp#7@J93#vC`(wuL5o1y(tD3Hk(*mR#*&MOfouUZck{*9xo? z7!*hetQXkeVZ}y|FkIPex1qh)3k(Tt64)%T#lw77q+ds}6t-m>+i|17*RqY-_`1M1 z94vxwdRU2(^srLg>|tfovBSg4vBSiz4z>)p3G6g+yMxb1pNCaohrli?c(((0KxOHi z-!^flYOr18cd5DdeDB?y<+nv6(WcIDeJmPph<1dVV(|{k5Ex0P?1qi*F|kKIC-Ty} zvd6gNJ0`wsVlQWv>a56ByRseWl{qJz;(OR9u^$IiuyD5hUWtP^r1}fDxDVn!6ZcCz zfWs2s$6qrOjgj(v zp2Go&-{1^q?#y|UiT)L#_SCxG{uL(9O8nN^=^;EX@Pfqe@S=&ABz})SsH=Ux2`@|h z5wCD&Mp|O^@mQV2t9VV_=&KTc!k;DIiNB~vee<(l#~aq?zA14|+59u|j^aFL)DZ57 zTB571RpKpNP%Zw+HGjq5ILmr#U;4sL!{_&&H1T(df8cG2cknJ}vOOG&w#Pdc#uhb4 zCC2ejwZ~sy@GtzEGh1^cz96FIg06UDm&ALxz*)1JJF7w!m2^4Zm-qnxk@yh*xs9M3&uGoP%2`^d_EtF6XjMK0m8p3Zukv!`4Lt3t;LLtLedOHOn4|y| zq{jn|oKI1+DjRrZdTV7i&zXvcB~8N_NmaTucTO$S7kW$`pV~!1&gxZ5Fi+J?Tf?i> z{%J2zh_fc`D*J4=Qq6u`~*eBF!u6QY&ly zSc1pYZMFW;Qd%bHT0y$APttNh2}^!O&~=^dZo6N_o(W+t8yFl zSfQ^8BqhRH7cjmtB$sY z(>HVmYymy7PSSdlHb~k?*Gr>DGv27y{5GnLpfsjvPUAhzzh{?J@=fUvmK^4Mb9&#h zm+d?^y{Y^C%bki5%hErUf`Y=}BvRW(0xn5|Yyzctk9M~)p$bPz%Rl6;4AyIWP-~RY zc4^JVBy;iITC=kW>5oU=%(4yA5T(@ld(Y17H?CtG0~y?y!L1p*A%ow_;7u9ap21r( GIQ)OzS-~X$ 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/SaleDataSyncServiceImpl.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/SaleDataSyncServiceImpl.class index a2f633c578dced7cb037876902e018cd0a997053..adac07dd2a1e0561c8867b5bdba963938324e619 100644 GIT binary patch delta 7575 zcmaJ`2YgjUy8p_(IdktlX*anEH-!M9q!0oD0)!%jASLt`K&l`Df+(OMqIYd9SWr1w zKv!2?7k6b@Br67NEBf@UZ>tU671_0+qGFdS??2~;2>W|)llSgsCmR?C}4DN%-Xm#rTgQTEu@c{O1V&h5u?>{uU+TePMo+--__x z`5z9y9U+(ZN9bXGC&E4WfGz&%@V_FI$?rP+p8dY>@CSxJv=bZ*^GE!#o$nLFhtQJX zcO3pSjDwfO=VZ&cI{H5Wq!c@RthpC9au>{{5{?73ChL0FNYWSGpWjqBH;w}7uS*0FurNFNXMon z!**sGiQ3^=wvug&7?zS8TjV;@%1As+!z9m0zFoB-B8AdA!WT(Vn5Re^BW*2pJ4;w> zq={<)FCcJ4YOLoDsNQ4$$uWVmH( zgpowOk&#A5MM-5$lmgPp$T%b89hnfNpmYk;wKB=bWXnW@kttD1L8DBQ^NdW7l4FUC zjIk}VjLeQwNX9sFzLB|My3NXFo?YkyE7|#Bx?3(ZvcQpr7GkF@-B^1nD@cTWQ8p*gVD+5j;yr8TV>=5yQ$T%JGn9}Yvd{;S6g#=89NHgPvjcQ z@3pqL&Q`BSpWI+%t&yMF#&xz>@5qf<{|U(pqqr%A;%19(F|r{fx5{m{a=R@y+QKuk zDJ*x$osQgPr@ra9f#oabpU)In zwS4tzuR2yDW^v=BST<`0XL^fsTABCd1D72(-px71i4R>l$g5oWNIquDs9m~r#qt%) z=3FxBf)xvv&Rd?IBA;Z)A$&f~;JvPVCZ9WU*p)BjOGmzP&96Ezm+&TWg`$H?QZA3|_?)z5+iLqefNCo9Akg zwsEwrtL?Pd)%M!K)s7ls%KY$-9UtDZ{ewN;`%QZeKegq`tL!E*@fEzpcJ(&q_tkD%<^46k zK)Y*?#>4p~oD;KLX}A8}TKF zZ*A+#Q?KLeT^(X&bgmBdLPgVbn8v;NMQsLeWDk?hnYU!&#g0OdBedStkvb|pMMr1w z3obvUV_Y38AGIB&EAByrb!m6%L)Jcv`w)<=FzA0Kcaf+)`b(*W^ z>2z0T=uB5<+3GNz%_KvIqImu;SLdLOHz`~s+c(N3b5<;Xo#e$Cr4wv^_8LQWq9l zW^|d$zv1mhmwQLsRusZMYRAkPGHKShsY9n2#YRf?GNYH(7qwCj;XtEN25F3qwDoX@6!$yd{bjy$HhUtS#N1v zUp^+l8yerLY^Qu{GJbdN6+zIuX}Y*zPoW@^}QU} z%+$f_*1NUWsdu+T3I!<7Mi*o&dDe&gZv;Hm+i@`&x|wEkd-R5=f$rcATtY$2 z`epOV7L|emv4%e8GA<{f9`rPK<_gjTcfrseAV^MJiHVbwbZwrbl<@2 zI2oeu#{JMMlm>zH2U5y`Fb4nys5R&DIY2?`$Wa~$ltNuN%!7a&s%GI@AVUM_7!L*t z^`oJXvDIFfHqfuR4$_X$ujp1D!skMd+vsK<3Y6*#+uB8PR3#4m?q1n|5f0)tb{B2D za=^AAXEm18HHh65zd#jq9ZlsCSSCgrX$03}?i@J<@s9*5)Q&A^0_ znAN;UL9piZB7tk07s(48XH}UV1i_p=)7@o+JAm2cs4gyK1Tuu-4fk4u!Rd6sw z;Im2x0!w)^*pE?lu!b8rF%2%)KiHkm!@wv_3>NToaF|7lg8`m_w(Q_#FevLOnefA# zPAeJ6stnEvWK}CZvZ_@d&4eZbKAHstPr*2=+7usI-8mK|d>cT7K)0`D(%?Ft4GzPU z61;)u07WPiyq3=ga>)%QcrMR_?d1kn@C7^{w%0DWkS_$v@D)EFlt~pXXi?#U78P2Q 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 aMxC}aPj$aP-~qpU$S)u9%U}ED-v0%vT}?g! delta 7342 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 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/PurchaseDataSummaryServiceImpl.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/PurchaseDataSummaryServiceImpl.java index db90f0d..30dc2c5 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/PurchaseDataSummaryServiceImpl.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/PurchaseDataSummaryServiceImpl.java @@ -82,23 +82,14 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService { LOGGER.info("未提供有效时间范围，按当前日期计算"); String startDate = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-mm-dd")); // 1. 计算并保存各板块物料采购总额、总量、单价(按月存储) -// monthlyMaterialSummaryBySegment(year, month, yearMonth, yearLastMonth, lastYearMonth, bkgs, distinctList); newmonthlyMaterialSummaryBySegment(startDate, bkgs); - // 2. 根据年月汇总板块、基地、年月、当期、上期、同期数据 -// monthlyBaseSummaryBySegment(year, month, yearMonth, yearLastMonth, lastYearMonth, bkgs, distinctList); newmonthlyBaseSummaryBySegment(startDate, bkgs); - // 3. 计算并保存各板块物料采购总额、总量、单价(按日存储) -// dailyMaterialSummaryBySegment(year, month, day, currentDate, bkgs, distinctList); newdailyMaterialSummaryBySegment(startDate, bkgs); - // 4. 根据日期、入库单号、物料名称分页查询 日期、入库单号、物料编码、物料名称、规格型号、 // （汇总）入库数量、单位、入库单价、（汇总）入库金额、供应商、订单编号、库存数 -// dailyWarehousingSummary(year, month, day, currentDate, bkgs, distinctList); newdailyWarehousingSummary(startDate, bkgs); - -// calculateForCurrentDate(bkgs, distinctList); } else { LOGGER.info("开始执行采购数据多维度汇总计算（时间范围: {} 至 {})", dateRange.getStartDate(), dateRange.getEndDate()); @@ -113,12 +104,6 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService { // （汇总）入库数量、单位、入库单价、（汇总）入库金额、供应商、订单编号、库存数 newdailyWarehousingSummary(startDate, bkgs); - // 计算月度维度数据（按月遍历） -// calculateMonthlyData(dateRange, bkgs, distinctList); - - // 计算日度维度数据（按天遍历） -// calculateDailyData(dateRange, bkgs, distinctList); - LOGGER.info("采购数据多维度汇总计算完成"); } } catch (Exception e) { @@ -211,9 +196,9 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService { detailBO.set("DDBH", row.getString("CGDDH")); // 订单编号 detailBO.set("KCS", 0.00); // 库存数（默认为0，需后续计算） detailBO.set("BKGS", bkgs); // 板块公司 - LocalDate date = LocalDate.parse(startDate); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); - String yearmonth = date.format(formatter); + YearMonth yearMonths = YearMonth.parse(row.getString("YEARMONTH"), DateTimeFormatter.ofPattern("yyyyMM")); + DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM"); + String yearmonth = yearMonths.format(outputFormatter); detailBO.set("YEARMONTH", yearmonth); // 年月 bos.add(detailBO); } @@ -648,12 +633,12 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService { if (!bos.isEmpty()) { // 批量插入数据 - int batchSize = 1000; - for (int i = 0; i < bos.size(); i += batchSize) { - int end = Math.min(i + batchSize, bos.size()); - List batch = bos.subList(i, end); - SDK.getBOAPI().createDataBO(PROCUREMENT_DETAILS_YEAR_MONTH, batch, UserContext.fromUID("admin")); - } +// int batchSize = 1000; +// for (int i = 0; i < bos.size(); i += batchSize) { +// int end = Math.min(i + batchSize, bos.size()); +// List batch = bos.subList(i, end); + SDK.getBOAPI().createDataBO(PROCUREMENT_DETAILS_YEAR_MONTH, bos, UserContext.fromUID("admin")); +// } } LOGGER.info("成功保存{}条月度汇总数据，板块：{}", bos.size(), bkgs); 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 a16a42f..77ae590 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 @@ -398,7 +398,7 @@ public class SaleCountDimensionImpl implements DataSummaryService { )); String querySql = "SELECT DZRQ,QYGS, KCZZ, LB_1, LB_2, LB_3, SQ, CS, QY, SUM(ZSSL) AS XL," + - " SUM(SSJERMB) AS XE, SUM(XSSL) AS TSXL, NMNY ,YEARMONTH" + + " 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"; @@ -435,13 +435,6 @@ public class SaleCountDimensionImpl implements DataSummaryService { bo.set("JD", location.getLongitude()); bo.set("WD", location.getLatitude()); } - String querySql2 = "SELECT SUM(ZSSL) AS XL,SUM(SSJERMB) AS XE, SUM(XSSL) AS TSXL" + - " FROM " + SALES_DETAIL_TABLE + - " WHERE DZRQ = ? AND BKGS = ? AND QYGS = ? AND KCZZ = ? AND LB_1 = ?"; -// LocalDate parse = LocalDate.parse(dzrq,DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S")); -// YearMonth yearMonth = YearMonth.of(parse.getYear(), parse.getMonthValue()); -// LocalDate lastYear = yearMonth.atEndOfMonth(); -// RowMap map1 = DBSql.getMap(querySql2, lastYear.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), bkgs, qygs, gc, lb_1); if ("石膏板".equals(map.getString("LB_1"))){ bo.set("XL", map.getDouble("TSXL")); // if (map1!=null) { @@ -454,7 +447,7 @@ public class SaleCountDimensionImpl implements DataSummaryService { // } } Double ssjermb = map.getDouble("XE"); - Double xe = map.getDouble("NMNY"); + Double xe = map.getDouble("BHSXE"); bo.set("XE", xe); // bo.set("SNTQXE", map1.getString("XE")); // 匹配公装家装类别，如果未匹配到，则默认未其他 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 79f0b26..cec5137 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 @@ -179,16 +179,16 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { sfMap.put("新疆维吾尔自治区","SQ LIKE '%新疆%' "); sfMap.put("海南省","SQ LIKE '%海南%' "); sfMap.put("西藏自治区","SQ LIKE '%西藏%' "); - sfMap.put("一体化","SQ LIKE '%新疆%' OR SQ LIKE '%海南%' OR SQ LIKE '%西藏%') "); + sfMap.put("一体化","SQ LIKE '%新疆%' OR SQ LIKE '%海南%' OR SQ LIKE '%西藏%' "); for (String key : sfMap.keySet()) { // 获取省份简称 String abbreviation = SaleUtil.getProvinceAbbreviation(key); String sfSql = sfMap.get(key); - String sql = "SELECT DZRQ,LB_1,LB_2,BKGS,SQ,SUM(XSSL) AS tssales, SUM(ZSSL) AS lpsales,SUM(SSJERMB) AS revenue" + + String sql = "SELECT DZRQ,LB_1,LB_2,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 ORDER BY DZRQ"; + " GROUP BY DZRQ,LB_1,BKGS,CS ORDER BY DZRQ"; List maps = DBSql.getMaps(sql); if (maps!=null){ @@ -203,10 +203,12 @@ 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 dzrq = map.getString("DZRQ"); BO priceBO = new BO(); priceBO.set("BKGS", bkgs1); - priceBO.set("DATE", map.getString("DZRQ")); + priceBO.set("DATE", dzrq); + priceBO.set("CITY", map.getString("CS")); if ("北新嘉宝莉".equals(bkgs)) { priceBO.set("PRODUCT_TYPE", "涂料"); }else { @@ -231,7 +233,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { if (lpsales.compareTo(BigDecimal.ZERO) > 0) { // 石膏板单位转换：万元/万平方米 → 元/平方米 if ("石膏板".equals(lb_1)) { - unitPrice = revenue.divide(lpsales, 4, RoundingMode.HALF_UP); + unitPrice = revenue.divide(tssales, 4, RoundingMode.HALF_UP); } // 轻钢龙骨单位：元/吨 if ("轻钢龙骨".equals(lb_1)) { @@ -246,6 +248,9 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { String[] gzjzStrings = SaleUtil.matchSingleField(bkgs, lb_1, lb_2, gzjzList, "其他", "其他","其他"); priceBO.set("MC_JC", gzjzStrings[1]);//面材/基材 priceBO.set("JZ_GZ", gzjzStrings[0]);//家装/工装 + priceBO.set("PROD_CAT", gzjzStrings[2]);//产品类型 + String monthPeriod = SaleUtil.getMonthPeriod(dzrq); + priceBO.set("XUN", monthPeriod);//月寻 list.add(priceBO); } @@ -922,7 +927,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { sfMap.put("新疆维吾尔自治区","SQ LIKE '%新疆%' "); sfMap.put("海南省","SQ LIKE '%海南%' "); sfMap.put("西藏自治区","SQ LIKE '%西藏%' "); - sfMap.put("一体化","SQ LIKE '%新疆%' OR SQ LIKE '%海南%' OR SQ LIKE '%西藏%') "); + sfMap.put("一体化","SQ LIKE '%新疆%' OR SQ LIKE '%海南%' OR SQ LIKE '%西藏%' "); for (String key : sfMap.keySet()) { // 获取省份简称 String abbreviation = SaleUtil.getProvinceAbbreviation(key); @@ -1135,7 +1140,7 @@ public class SaleDataSummaryServiceImpl implements DataSummaryService { "FROM " + SALES_DETAIL_TABLE + " " + // "WHERE YEAR(DZRQ) = '"+year+"' AND MONTH(DZRQ) BETWEEN 1 AND '"+month+"' AND LB_1 LIKE '%"+category+"%' AND BKGS = '"+bkgs+"'"+ "WHERE YEAR(DZRQ) = '"+year+"' AND MONTH(DZRQ) = '"+month+"' AND LB_1 LIKE '%"+category+"%' AND BKGS = '"+bkgs+"'"+ - "AND (SQ LIKE '%新疆%' OR SQ LIKE '%海南%' OR SQ LIKE '%西藏%')"; // 模糊查询 + "AND ("+sfSql+")"; // 模糊查询 double value = DBSql.getDouble(sql, "revenue"); return BigDecimal.valueOf(value); } 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 cdb6205..ee428cd 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 @@ -758,6 +758,8 @@ public class SaleDataSyncServiceImpl implements DataSyncService { String endDate = ""; // 查询梦牌区域 List mpqyList = SDK.getBOAPI().query("BO_EU_DATALINKUP_QYGSED").addQuery("BKGS = ", "梦牌").list(); + // 查询龙牌区域 + List lpqyList = SDK.getBOAPI().query("BO_EU_QYGX").list(); try { do { if (startDated == null || endDated == null) { @@ -820,14 +822,26 @@ public class SaleDataSyncServiceImpl implements DataSyncService { } // LOGGER.info("泰山应收的数据：{}",bo.toJSONObject()); //销售汇总表修改区域公司 - if ("梦牌".equals(map.getString("BKGS")) && hzb.equals("BO_EU_BNBM_DATALINKUP_XS_XSL_HZ")){ + if ("梦牌".equals(map.getString("BKGS"))){ String cs = bo.getString("CS"); String sq = bo.getString("SQ"); for (BO bo1 : mpqyList) { String ss = bo1.getString("SS"); - if (ss.contains(cs)){ + if (StringUtils.isNotBlank(cs) && ss.contains(cs)){ bo.set("QYGS",bo1.getString("QYGS")); - } else if (ss.contains(sq)) { + } else if (StringUtils.isNotBlank(sq) && ss.contains(sq)) { + bo.set("QYGS",bo1.getString("QYGS")); + }else { + bo.set("QYGS","其他"); + } + } + } + //龙牌 + if ("龙牌".equals(map.getString("BKGS"))){ + String xszz = bo.getString("XSZZ"); + for (BO bo1 : lpqyList) { + String swfb = bo1.getString("SWFB"); + if (swfb.contains(xszz)){ bo.set("QYGS",bo1.getString("QYGS")); }else { bo.set("QYGS","其他"); diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/SaleUtil.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/SaleUtil.java index bee7a5e..2fe6d10 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/SaleUtil.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/util/SaleUtil.java @@ -81,4 +81,24 @@ public class SaleUtil { return sfjc; } + /** + * 计算月旬 + * @param dateTimeStr + * @return + */ + public static String getMonthPeriod(String dateTimeStr) { + // 提取日期部分（假设格式为"yyyy-MM-dd HH:mm:ss"） + String dateStr = dateTimeStr.split(" ")[0]; + // 获取日期的天数部分 + int day = Integer.parseInt(dateStr.split("-")[2]); + + if (day <= 10) { + return "上旬"; + } else if (day <= 20) { + return "中旬"; + } else { + return "下旬"; + } + } + }