From df919f5121ec586313af34829d4c9007b27dd35e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 5 May 2022 11:04:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcBuildingDTO.java | 2 +- .../java/com/epmet/dto/ImportGeneralDTO.java | 2 +- .../epmet/dto/form/IcBulidingAddFormDTO.java | 2 +- .../dto/result/IcBuildingListResultDTO.java | 2 +- .../com/epmet/entity/IcBuildingEntity.java | 2 +- .../com/epmet/model/BuildingInfoModel.java | 3 +++ .../model/ImportBuildingInfoListener.java | 14 ++++++++++++++ .../impl/IcNeighborHoodServiceImpl.java | 2 +- .../V0.0.18__edit_building_and_house_sort.sql | 2 ++ .../resources/excel/building_template.xlsx | Bin 11331 -> 11478 bytes .../main/resources/mapper/IcBuildingDao.xml | 3 ++- 11 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.18__edit_building_and_house_sort.sql diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java index 2bb91a53ec..ff85334a8b 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java @@ -68,7 +68,7 @@ public class IcBuildingDTO implements Serializable { /** * 排序 */ - private Integer sort; + private Double sort; /** * 总单元数 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index 583a76ee91..b0d0257526 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -166,5 +166,5 @@ public class ImportGeneralDTO implements Serializable { /** * 排序 */ - private Integer sort; + private Double sort; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java index 0039390e15..e59d837768 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java @@ -85,7 +85,7 @@ public class IcBulidingAddFormDTO implements Serializable { * 排序 */ @NotNull(message = "排序不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) - private Integer sort = 0; + private Double sort = 0.00; /** * 总单元数 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java index 550938c23e..1d95bd3838 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java @@ -29,7 +29,7 @@ public class IcBuildingListResultDTO extends PageFormDTO { private Integer realTotalHouseNum; private String latitude; private String agencyId; - private Integer sort; + private Double sort; private String agencyName; private String buildingId; private String buildingName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java index 98b4d54012..e52936bbd5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java @@ -63,7 +63,7 @@ public class IcBuildingEntity extends BaseEpmetEntity { /** * 排序 */ - private Integer sort; + private Double sort; /** * 总单元数 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java index 81495c3da6..1b5a6e0678 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java @@ -42,6 +42,9 @@ public class BuildingInfoModel { @ExcelProperty(value = "楼长电话") private String buildingLeaderMobile; + @ExcelProperty(value = "排序") + private Double sort; + @ExcelIgnore private Integer num; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index cc0bc625ca..5764e997e4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; import java.io.IOException; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -117,6 +118,11 @@ public class ImportBuildingInfoListener extends AnalysisEventListener=@0m$+3Npd~?r`_QkL6{JC6iu`U=N z6fOmACwpyLz9VCKMLi^x3GNwDmyf%Afs&Gx)$rF0C|ff$5^*pKJz-Fz9oeUF`S1}u z8097>Nd6?+bG>ph&BSlU2{0GB`!XBKssJ+%w+lCkGApzsR`iy`mto%j_*gP@l}0_K z@I#Lk$vRUt7VlUAVV8OeTYBrv${X)%&X;Oz=C zk|u|K7!CQwTjy3!0jfeLN^2!}U5So{#s@+}qd8Cs!E|#TVn9rFa=z7J_F(iR*@mU0>4)Uh_L;dmbG|H= zXv_BMyf^p0^W3uOM&Up*_?jagIEgB!&qZ#ZMMbQ1e5{iBtopK7x)-yY$W`w(_t6Nv zj^mhCsqi~6(xdsYFU{_~DI8nzV{D4&(DZA9n5b%JV@P_sf2G=cqAY`kLrrdGna@K% z3wf2_VnRcL13+#_qerZVVqTBb_KChh(wpK7SL4(>STA*psB-wRx|ZL~M^HK+WU6Vz zS0aTo9JCx-7EpXxPFUteISw9#BKU=>pN7fe$(1aDOU-*JM#h0Yn|9+zSXTMY=Xh7! zD&7Jkptl(B__h7<*<-(_p%1!Qr)JYGx}IwWr^0N$_)sC=lNgQUi5IMV7h3PI*H79W(J*m+~hZIO8gR?bgp|O_)*sFDrsl(D2q_@XfQs5~$RV^n8I{bF zcSW2KK2{cZk>XPRgA@`Q>CYKk6QZux>wB_bYV2suXirKv51((qCH4YAvI8HhZ)Uz# z`oT?L+*Ll4^IWu(_Lk~zIHi>>mNnJVRhOF((J#@6LKgc9 zJq(=6xCiUjjCi~9Y+7tz-SZRlI|Iv3a@fDs z@x0s_IP1XPyS5YQg!Slz$zO0j-*x!7 zs_4b5L5$%Nr8rjhKm-hwJrzCRqSYoAKGms$8*B(>OxhF{3KLqF$BVM+ag|8^tauM(NS*8Uo6^#}ZO@H}fKP77 z>fU1g?@$>5p}!vDMEHM-E$}zo{}fx`Z@B*{wu*nl{eQ7dVXU7bWW~m38@{KP#79FL z*Gi+H1eVhp}(!ztFetvRs300lyPUWs$wGoNr-jZ#U{puP`a*+L0$4IJ=eH&cBg& zS$=X9Fk-=Z&=$7B^D@^_&EvN(%HuWywj2Ek_?W1ywyV;#Qrpq(ms3VwZrNIUJLcwm zQ9_Pv@!5Hjiox^yRlPTjlFHoZ)~g%T?!xWZ>d?vB8&{Ic1KiFioUJ>Zo%uW&mc0Nw z3j?RE{KH>mhr9r)K2XQY*)Iq|f2EetOna-jqP7To0PcvN(q(m%qXc*K{v?4xzAvwj95Era4SXvp5;SYvOH+7V zG&9(o#jT$`M)o$wfDk%{2_Z99ji^_QhqTk;7uIj*9@l(|j8*W%eG8cXeDLi^mA#6rU~uaRN&%mYE=~-ie^&yNB=s4}6Gcr2m zUE!%Vy_kJ2)8r|_w$eP=zP?#KIM<3*9UMHCNPYcvBsfpwr;cTvm`SFwA$R!%XL)ZQ zI@^kE>0_6f%Mb1N#B;3MPTZPNzds*lY)a*y@ODYBeJu$dvmGd$5j-pKH79NHPs5w~ zddqy!os_B|<|It{E`9UsC6Kx8&C0b{6yzTBtz;FK@`O1qoH2N(`BHv$kujL(GsTHy zapXsic>~AH;-~H0inHPe@)Rha3&GY{&w>EHS#$*dnITkY*7JKuf7U`%Xrdrr|8L2j z7b{-fUj3@r1jfu{>aVswY&=_$-Ytd|CCGfnjW1!9s{=;6# zt+gv{MwC`~Q|7zFESo+#Bc*=? zB@yR-(V}T_X?V08Rjn068nC2kAAdOtUc`@Cy@p&)r23sk$h)oJ@di_2IE7Uot%eC- zzY>~dZaIh1C~8UemJ6Yt1YxmH#9~#J5*<1V{9%N*4Z^Qv19%dIj0`b(t$1PT?OySG zJOHIoI|DZNj}|%gv?--hbvcTSXQ{AytQj^nod;=<>r6MTvt5iro)lS~I8fW{@FJaa9Ky=@_muM z_DTZ0vsXemgHD!2r2@acytDA%YHkZX^sktlOrj2^KI0sZQ?Wf~Ykla}iR`*X4oC2_ zHMg)OC*Zl$MmuWl&abRm9nDAh?}QCJl}8qcY4q762erSgIe%knW|RtlDn$@2$bsj$ z_bHvw?rMvA16X3Zz4N|0KN;X;N?f^l7M2erJR#EG&eA_I$y0kANJl*s)Qcq!*1_VK zC9_~N4P$T9??5SFgezROK*c{rG?*4vtqa%AEv<*y8>Kip}M@GyR7!wnrBEWv4ErL_3 zC#|^JgBKMr&wsVvVzf^AB!JmUNap?warXIH9jpjUqXuse@NFYFvSHPLZDn069Y z5*aCFA{jfow!MAuiqxRyGZ*>EZpTEycoZ=p7VHk3pS(#hj3hfq)o{=ul)Md3eMTYh za)CZ1IPhecDZQVN#r?&N7RUB*Id%DQ@{x2{vFxuMw`YYh*_HaAr&VkID6489)@-;d z@>y%f-k2vQYS4)2lbwmSu|9L zPv$o>RWdT1J<_ukDNA1f_?%q*o{2tAxIbH6pNOAu8>a!0>P)h+=UY>-B)#B%R_s(c z%%e;~@okwBoO?3WMF8A%#*hNdaL&jriP+!MBO_5CoA@)cBB#BXa(c|5;!K<96SU9`w^YwcFVNDKVPv*WhZ;TIYCD=}!-_Zwu*Nn%3kC3KxAA$G5tI zghpY%qushU16Ly26dZXB?hHLYnyhz{T-3J7xwxA;E4Co-Vq9;4f0qyYsr<>}Mw zcr4>XU{t;DFEcLum;~m=>GOyMzB|r|!l6m4#bXnCWDjX2=c|}Dbu%$-1zR+k#Gp#A zgoP$Pxtqtn^a$uozW*KlRDx6OfZ>dQ1uQk~+A_4(`$nFvl~F=!e&wqY5f=vrl}3-W z_XxVr&Ub8dXwn$|4`_vcYqY@CBW;=n+mY9Rh>D;_R-Mi4Knme72+UV$n5hzIa$p6P*WI!D)Ua}#P88NkkN{h=GxeBTFzxE5F(Jsutden|iCChGqztA}@kHn=Fa2>rioJTx?#f9~`5d2R40Zf=HuxCMVM@9@X!`}cep XK75QD@_!U~5x~iLAlS^De{K6;X+kI_ delta 5811 zcmc(jRa6x0*2ib)k{pokoI!>bL?uLE=okrTVnL zEMJh~Kq5WaBo_nKUM75P3Hvefy3&`c`;(wU<3bKW^Wf#(>6Ua@{^@;Pyir71nOo>* zPC1~B31RUpT?>R}O_He0{AE?mL|hJ&zUZiihPH{030;$r?!5t6RRE8zig!j%jH_7x z+|PTwRy@l&?M)@oW+ShL>5;S1($!+C5|LK=0p@{{p@s;3GWj}1qNl9;<$O~9tF+3R z*%|#7awoB~0b1vyq3U#!Np7tRqjj-TR>aFuLD&6Xy5~fP^HV*9eEkAh(6fz8MLAQ4 z6%yHxsXw@2f7Ru_yYjmBMgHRH&$DaoPB3UZ8!~~B-*5c})6I#5mVUr7s7I#)?gDeG?PnTQ;(&SFEy-8S1fIk zmA42S*Q&LsIKG_rcwpX#G>W@&)Y9^)HL0bnPW4!poXB~2@#YPR=MhX988j8uKXjr6 zzsg4nXyx_fF`5v`waEAC9?^b5CC-&76?>!#Ii^j9sxZEfH-BajE#b^|ebFoO!9meG zI&s!VE`f%>O+vg=n3SlZXlmaKN@JHpsPkr#H}VN>ci%h-pKZKrN&)3Bf*AXWvjhZJ zG9>XnR|T75et02_`AUjtgzQG)fjx8Bu+BGR78_npR{k$>j5pPkq3x}Uha5x#4)iW^sK&oe#}xK*;|$sSA3hX*lk_U!i$mC zkn2uvT-#>X3nUJj0c&&TI!@h`Cg0-5(W8p-SV?hWYTYie004J90Du;NLhw_gp!~SV z7~LV4NkPz(NUyX_9pbsU)G)(hMuV+Q%C2gdT&teFM^OxOP}KS|uQobyzr~JDB1n-2*l#IBLUde|S)Xr+!D8B)R|$FpC3EYmb>NXKaTR&zqa-AlJK`>L1b ze|Tqvc0@nd=8fOc;}rg+{8~ZMEwo;uwn+9&rbd|kzGXFjA1=;A^AEf3)B>c)TX4ws z1mSIpEWPSsTt3X7tbH6p7St|hB;2BXF{6Z<$K4X05Dk54Zeb@uWoGKHBiJ0;ibbnH zY1@$hDe)A54bh%WBHQnp_a?YS?w2>hbbq-X%Id8kh7cCz;)@GvBR0 z*sRyj&=%Jaxm|JaSM~MV{d!3-V|Xo zOR>Ri*7;t-mi>`?Uw*{S3tI#Yq2NILg`)j*Tb0T*6eg^1mjOgJY*thhNooN3GPVl)D4D z_7cF@(Eq&%`!-47x@Z70<(pn-RD9h7N9j7=5`dN5vn;(K5I1MYh^wJ-<#{hJg`9L7 zu4g}{HM@mhQgzJU zY;^dW{(NXQ*#FuQdSnc0MPpHr{L>204{3cr9`!;XL^+VV#O`fMFkZCv!)8uBhpg&K z(E03f!k9Lk`LoK1XLD@l1xNpMZS6XtnedK^_v*hopGw_n8v zaTE36Aq*W}LwT`jz^{RTLPE-JJG0y3hir#7qr-(>YEy<4?uFYj>t>M$-nCAOS09Qw zxb68$$BSVL&PlFf$QOmBu`(>8L%U7O!8&;O0*;ntImy*V2Gr)nPPrwK18*2Y=OYLl z_>f;Yr9Pd!!bUE-A)-tXkiK8!nCV1e78yhi^GhDl&dgQ%GA2IuC(MB9Onqvn^YgkGZyrK{T-uE`|%4J8!GuR;ClJxr_y0NA^PPK z=Tv1nLG7tfyz0s4L-BldVi`!msZM2PA3p8!2PEpt!`WCW=o9}5%6-b z|L*}t{!RG52N?M`;r||BnZF7DKLE!u*9MVt;1Q+tnpC|a0su5LP*osm<(u4G{gWB;*u>t>ukKb4$JBFSS-jmnW(89*P*GgUgvi!vrdSh_Wa5>xQ zJWq2EgAKJCeDs7X9wNQh1JgwlG&Zc@>N>(!?)tl8O>S2nT5ql*sdvASRTvd7Czwzh zUCj?fM+N%@-E^Nxw{Z<7$wT!BpJY*{PtW^Um~6wFJscW@7xIOxi7AgNm8$1=BSJ6` zx|?dfMDLrJjjwyg5qYic)2HpCpG&Z`6s#K>dm8f>(Zm>?>dEpBwGOgTHP9z$JR^fvg0=|}I`<-Ye zSHMChK6^}l9nBa0%#_OcyIF$;$YnzCxF>&F&mmoef#)8Q>RlY=kh0iF>ZJa->X|`- zOxogPPqg@IO^2$f!OR1=s>#!hXpi=WZ_(*G8fmMaziaFGD$KE3eQ_xtA~MwOB4SXW z3J`R=ua~LSBZf}IZ4x5PX?8YBKCcs8K#43GD(Zpe1FU;2`JQ%oyWqqG;Xe^q?jy?m z@b*F$k--Z_3cSB0kXvzYQHlx@muh;Z!XR06Sm9_FYAR}1Z>1&#Hx`N$xc)Kxezrc= zVW)RL|I#e_bLpE<-xM>>pRZY0#?lmw#nP0i(;Iv)f5H8*`yM9w)Xs~#sda}|m^@`} zc>x{JuT70kpT(+Gu)Ay7s>J;sV^-6QZfTygS5~+;jSL=*bWpQMJydw>)L*k+5%FXH z<*K2kkVQ?MKBmvnWD%jnR^Mn|7Zm^!VK4j0F7z`h#O+|;)HiR1jJR=Bg1)~mpW;r_OzmVMw^=TFNN|eXUDAjL$V4qS{*>} z_>`s&3*^-*OhC2t;x?NYqNm-apAR=xRvB?{YW9Ez!d|a3GUj&1BZCX7{6LrQBz7Ln z1RNU(FzQi8ZbEZ|KMLqi+YOGhnIy53NtDZO_D{w?fK&YRZXh?V+o*FGg860gwbs>TT)kR40zc<;d0EkhIIiH1%))1f9h`%TVa zbJ_mwbuk7tFwAL$(oMfC`?=m#iidz;0pIs7^E3prQUPB_215wVWE0y8p=hcAZ{uOjO;@pJtb&>#WT+XP_)*ags&u5!#FY2v{Acpby7(OZsR2S&)eRj@ zq}uj`>Y`+_JYv@<&7fi68Gf`p)1tdmHroczlShoZc%aq|=2~mOIXqj;t}YD7)RVV_ zi6eQkIdqQRdW3JXa*l{!BxNrQqUn=5nI;wFeE)XdKIggGTnTI77Q{eN@o11C=ywNG ziWd}b1}kf+8{78k)+bliXK%PG_CP%t=^2*oe9o09pH6MINS#uUr~?~7jlD>O!$2E- zN%RMiFk?au4XeJ^DohFaKAdmNBUJk}Hk)Vx*Mt_ndjdFsv|l$+Vj|csp`eJcv0x?A zod+cVR?Sx4)bMI>D_$au(y(;lDUtX=J21ewrxszBnX_qmlJ7$I*r0;MI=39@Zw2cQ zeiBT=JuAs79Fg1QEJ=lHt6=EPEwvQvV=ZyH_Hb4StxMh}PanjUv(xcb`h#7PetX z7w9VH*pfyYG--zlhRT}DRpAWWmQ>aO?f54~;9b-o3XTzFZWqyk+NwZ|%6xcYjJ)*ywZm1`4@wcRhYGC>3EeRaywb zsKvpmu{^Z`Yz)}AW>2D&P-oEJ7<v(GSf&s)t%afa&AX8j7C3)0GCI6!-|e>pdyUd!eJdw~tHUre-luJ4LQ0 z=TCkghh7}Le|noX@l!L9Neb(i<~^y~$OKi8km)?bJ0GOak9n5-se6y#tga;~jpU6& z)ukDiym6i*&jweDWSB+7a^9x`vIp_~)*}7MkE)kN6;C|SqBNVvJA?Ys&Pg}6zqaA# z%u+r67HDrU1Jt>oW=-g0mv!&8XO?t3nb_(2Ml9tIuMi$C(B!+ze#}jJRM0kf}^Ocu0xigt60Fz*b1kJ z86iAW!0omPLX4GV(IG;((w>7+5F4Q&Hfows2_%G1b&Tq5D4xeKfp4ZQ#GP)z{!`U> zh`rf7i2Vv@qOW0O$JlgpEuW|sqT~HiOV$v5Z?mlnpR>HM7&@dnWr_Y z_2g}Zspsc_=!&IUJV!T_iT&X2k9`a^S-6((Z2E|UbPxYa7oQt?AFi-O*$2jFo#~bIxlIhu)&Y1IMYe^O2(pTlloyb#k20PV)B(X2{i4 zW^!yU_i3Jp^GOD>YTKbkV_kCFrdP+5F5$aitW%6)<$g+KNfd5x#Gakx_2 z{3Xs6ASY&0EeYT9!D*4d4kwjsYizA;2%)eMFwf-Ulk?>VT+Htg;f{T_<_eY=Z<*u9$(7$^ z^eG`nPNcun{cdz!%}CCx+-q*up#>(()!lrc*Ks5o?CNY)Dow2Rt|fS( zG}+Q^!B6kl>U{OO75BH`@wbijjmzCn6nBQ_K-^k!RuDecGABxvM;b_uislgkilVxB zQ2#P#^?Bh~AZ!#An;O;23kJSM9q|eRjZiFn;#fiKs262u z$HVx)8UO&e_gC>x{IkA8g<9j21V*D6z)Xz)V_E)D_5bvUR|92%4z7>rea z4}}JcVST%Y8U{;a<*}ehAyPm;lrlsLtAPU*29d$q;Xn;S#2Ek6Q~USVO7Q;Wuu AND a.DEL_FLAG = '0' - ORDER BY CAST(b.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(b.NEIGHBOR_HOOD_NAME using gbk), + ORDER BY a.sort, + CAST(b.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(b.NEIGHBOR_HOOD_NAME using gbk), CAST(a.BUILDING_NAME AS SIGNED),CONVERT(a.BUILDING_NAME USING gbk)