From 8cb6a23b64c665490804c3ebfc4794f5ad82a98c Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 28 Apr 2022 16:52:47 +0800 Subject: [PATCH 01/30] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserExportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 69a5d7eb1f..70c2dbb55a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -318,7 +318,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { //如果是多选 则返回顿号隔开 if (e.getMultiSelect()) { List valueList = new ArrayList<>(); - e.getOptions().stream().forEach(option -> { + e.getOptions().forEach(option -> { if (valueStr.contains(option.getValue())) { valueList.add(option.getLabel()); } 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 02/30] =?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 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 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) @@ -203,7 +203,7 @@ ${groupTableName}.ID - order by ic_resi_user.CREATED_TIME desc + order by ic_resi_user.CREATED_TIME desc,ic_resi_user.id desc From 0c174913162085b5f645e73c223f24e992e5d263 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 6 May 2022 09:26:35 +0800 Subject: [PATCH 09/30] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88-?= =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E5=85=B3=E7=B3=BBbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserServiceImpl.java | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index acd519fd43..9f859dff88 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1114,26 +1114,30 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId()); - wrapper.orderByAsc(IcResiUserEntity::getYhzgx); - List resiUserList = baseDao.selectList(wrapper); - List userList = resiUserList.stream().map(item -> { - OwnerRelationResultDTO.UserListBean bean = new OwnerRelationResultDTO.UserListBean(); - bean.setUserId(item.getId()); - bean.setUserName(item.getName()); - bean.setRelation(RelationshipEnum.getEnum(item.getYhzgx()).getName()); - if (userId.equals(item.getId())) { - bean.setIsSelf(NumConstant.ONE_STR); - } - //如果与房主的关系是本人，则这个人就是房主 - if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) { - result.setOwnerName(item.getName()); + if (null != user) { + //获取用户所在家庭里所有人员信息 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId()); + wrapper.orderByAsc(IcResiUserEntity::getYhzgx); + List resiUserList = baseDao.selectList(wrapper); + if (CollectionUtils.isNotEmpty(resiUserList)) { + List userList = resiUserList.stream().map(item -> { + OwnerRelationResultDTO.UserListBean bean = new OwnerRelationResultDTO.UserListBean(); + bean.setUserId(item.getId()); + bean.setUserName(item.getName()); + bean.setRelation(RelationshipEnum.getEnum(item.getYhzgx()).getName()); + if (userId.equals(item.getId())) { + bean.setIsSelf(NumConstant.ONE_STR); + } + //如果与房主的关系是本人，则这个人就是房主 + if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) { + result.setOwnerName(item.getName()); + } + return bean; + }).collect(Collectors.toList()); + result.setUserList(userList); } - return bean; - }).collect(Collectors.toList()); - result.setUserList(userList); + } return result; } From 8a81223eb6d92a8f2d628f7dfa4bf94bb2684811 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 6 May 2022 09:31:24 +0800 Subject: [PATCH 10/30] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/excel/building_export.xlsx | Bin 12629 -> 11432 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export.xlsx index 226101af0a2ee33947c5e1074963f20a26a2f1c5..5a178ed9bbd2907836ef56358413d3d8db683b3e 100644 GIT binary patch literal 11432 zcmeHtbyU=C*Dl@N-7O#uN|!X!-Q7cXr@+u5jevA0-Q6H9jes-~10n)aXVC9`eB^z; zXPtk~TIc?QnKkT~`?~Jm-h1x7mE@pdkRTpbgyM$C!|Q(*BKVCNz*NZ@;OO#H2`q*K z{s7^p*cGzZJwGG_1ON&G0^{#u#*U7xp7wUxiDR^NZ;!61y9cl&X#lGAZS`(w1; zx5TCM+Z)j#HqYmsYp*n6_(E%T#019~TR^!nwK#bsy72kZ(_~g2L~&zG@@1Y)b;onQ zU&0+=b@8v|BPVeQe`}Y=WJ$S8EFzS2?XxJrhaQAN5si!I(n0lAl~U>58x2nkd*bZr zFdb!q@Ips(Yp$&4eug2m>||(hFcpY)ko{c%WG|a6o^NZ@J^QKX0DNNdAanN(Kl8f$ zCKUrBQj(U$g+(3ll*o>B{Xm<+i4;VJ+VCP&E9am*uUBV-S)Uj~8+dkOkX~p|gh8EHBG7h`~L?UUcKt0PE)-C0I}OarHNbf%Jas zv6P?bvJP+|Vt)AQPLC7a+tW_pl^thOt)Ww$-l}fl{|U5xf{mXB7-&;4(3pP*+7#ey z{(!V!;*@MJ8%{U~b}etKLt&|TLu@%{qzVV-Nt6fWv*joSox~3g=$qN|23N9RoR=Kx z#W9_e&hB?d1JGo4bhW*ozEMyv#R-EHC1Ws%6suHm&3$^~vPC$WY-ChrA0$(J1)Bv1k}<9SK4&2W>^=&Md`?fmt>0TbIV_;`l9)SEECG zY@@mtxD+PkTL@SKUXcT;KrPC*V)d;Xfi)72BiwAd`-cacM`yRQ*)VZsM{sf$hcUX} zYapDeM}cPM`zif&-JOzBhj4q<6ax5>-=Rs8BZjxtJ4Cc4dKS>Bb0xe8X7&kbw@Ur4 zOFCl~@VA7zJNt${7YRkWa1>yR71v^(LJYO646adK!~ID@lpjeI9hd|ZFbUXykl^Ox z3b22mp)g@W4ot%!DEMA{SWqE@RiA$;_8k8eJnZf6&Pe`_oUTbEzxql4^?Zok$1m91AE?m zeZU35n#1wEyAGw;?2@ib?JIG*z%u=z?7ZmgA3}AY_1B zU4W!}RQAya2cL{AhaCT&mj+J{C(YL@^Uc+jp#aDXfUjvc0Z%c zKMOp33KnoRHnB5*9F4-><%A@F`MCx2^AMwc%l#B*e;~*$aYC_21Y-b1*U@VMnhuVV zwTfh?oFYKaM}I#Jn_=gXc}(TZc^64UW0PC}gANDi=}to!D7KCUd`^W5(sF36?M%P2 z=#;TkWQK~Z?p1ifO%PX#VU%GRE)z{8ATY#QDc%K}4@U(wLDgW7AoO#hWSPY57O_yR z>Q2OPmsR%c2xaLr{V<@`fsAu`Ex@^Lbn_Nax?>?x&jj(2O~@o<+7Ma0&O|E z!Rpo`TeE_a8-QtRJs6I6vosq9CKyrTQmA}Owt`BsTB$`l>lUo!mbL zKBw`d@-yNy4xuE`DRUFB9v0vK%UMACMWF}4+1AC%+}!ms-AFv5Lfv4hnc*QI2>wg< zr^-*tV^W44mf0}Cq45VA3}|Y@Gh&+}=73HV8Af3_%i6{aGfyJr?IF#}wLBc;ITZ?_ zq3M$uX5nWAv$Jw^!;p2DOmS9wu*o9h>dasLBm(Z23_dWjr*5++F-5%U2+q?yn8?+T zD$G?tGD7qoQjk!!jV=Tc=ZFmei;;$$XqBIv;*p=P@`l0TX+AZdCWr0*IFUAFePmoJ zydh2-x&B_c?E^()JvM5h_J_5%`E2xnr>7A&{TZaybE-m?j1FH?1`PR*w_hVxr6@<9 zH;vppulG+u4wx$A+!U08HZhkMe%%lIob`QEc6?8V#`g4iS>lQ4^?^FG5?rH)ggDmJ zfuomjzSX-|!ceh0hdEjeJ}`(YVn82-$mQN_l?k*qan*HS&A_vvCS3R?NJeUJ{(jSw z#;Bl1f-V46)>>}9eYt+XBu#i|%JeG36^%*e3s)S^nNusF^sw`kocP=?p2#M-Iv?zI zjQP}c7@aTC;NzS2um+m+WKe=N6A?X(7>5^-?_NILHD%rl5C!_BczR>*7FIL)OcXiq z&kL0Y^L(f|mo2C6o(ZXAOyghv%;CD^XxZ*=!5oSuKl|qVJ(|WHr1?6i@3jzSLu959 zyA5`xkkcYv$M;C5%!TifGMSfi^hNd?4KF_|_37uPHAY?wRa+sD_dDQ7DM#RV?7T9_ zVI*^>eTOLkHC7a=KL#IPwFfP&c@FvZ$u-3EtRKWal5n7F3b{zjG&+U;(Sb(QOaJcg zCn5XoL#PSyZ_0^{$>b-K8uYlkpOST_ z!ZK<>{!nf+e$D#+s=n*gK;irqo~-UzsN1a}{E~(cVvI+_O<<#;*AVg0+;dcMe`Z^rIw}c$e}cR60ZwHD`xk zn?yThdqZH!pOhvGDmSSy%?k2mbD*q0n>KOHxFq0D5rg>zlo>C3=jC6O#bcltI(kV6 z*HBq%9CSVqRE&t#ZDVp<%1e1Wzr=nD|4e#E+6n+-UW|79y#TGl_5`y7Y7Q#+ z2B8f)cPt6nD3Vfro7b2g%@mCMEx5zgB0>4qQ*uG8-V94{(t!rkhMPQ+nNU~Aq|Ta8 zRPt>GhbUQ03~7!tKW~0GL2YhvJ~tL?H~j!>Y(4l+zw8H@A~aqi*OyBVsgO9<>zsH7 zR7`Wm<4YIjoAOq2e@ED(Ap-gZ=xepZH?ib$=|^fzRDs4ctko#RCw4ua!8E?x%CuX1 zFgJ8{HR_c-PY|g}L4^#Ejg55JSVjRJpBr9wdoYC&Auy0L6?>8rE7~Ga?&QlgdjPEl zBM8OZIeO3wLCQ2V0(+P0x4W9|@6;w0jU~3>bbB4%+#|L2P-HpmKl9>ZrLUYPKHo9e zH-s+H8$8#&wdmCTF#~}E^L{!jdcU@MZ570gQ~^06{M`3Kr~N1+jQ0lc&S}-QBmnuH zX!HFKB7e3$F&vgQxb4dUq7DOqz1snvL5Q=j3+h_g@%a}PuoOG(zALJ}Jy&CE^lWN8 zVgbCOXR9)KT?5jt9FCf}w!TdiqTF_oj@%^l06c_}NED5X;IoMn7+9rFeTm^TY*4&J zwc5-ZQXp{mN{M1F{39?2fp6Gsurr5p0aNbXJHwmHAN`!5^XTH@xSU*}AKTwfH)o`T zcRQGSp_5+}eJ%%eUS2Q1Z12qRyZAD!>Cnb@+IjzN5zy(s57#54!{L2(J|mnX>~}S` z8*q2h2f4OsW!ED`)7{e=`Ld0lIjDZWYvIFbT4#Dc!;8Ke5%x>>rsL5CsMRd$FFi-5 z{GJzl(yx#`?Z03wJ3E-O?vL8c2jK%%1p|ks?37tKm~U9ien*44ZS$&u5=^p{ZI6(LR91Nz@Y`E zw}n%XG89i;@I|HTaWe~iR)q?x)Gtn|V?t4bN>Ql5-X(k^rXWAABcJjzp>C#8eLW%GmlkD zhA49(t{+Dh$Ez{jwL31YUHqfR5VS0B(KT7OM#}_VaO;~ax6ID6+cMF z_hF1HIVcWO4d`hERol)8S4Z6k*Eai_z0frJys?jk8Kwle+Qm9Gt?mQf zO=f=ox;(#Kh!Y}P-fQH)F}Djc+dTCVV;~)Q)*m63+Xc(@#t|Z9MA7iMlNafz$z_Q< zhrH2es@S@i!StKZAy0w=6h#oX;j>7I&(E<824Gf*&fm{8_RMHI_x0S&X_uE0TdZuUwEB|mdb8sWElVe&J($~dL@Go__%T+AURQ$J^9olw2XGn9AU6

(d@FlC zRdxVu*hGELm0G4DNd@yF%CsP`7aJgNd4m>=Wm{*%6iA7A5>=ck#YuCbQG-)sep|^^ zB<4OgAKViD)k&h30GG5M=ZvJPuruH8S*pOYNrBU7RJ^#WDnCYkE!kk-Cf2Su@@1Vb6sZDm7S8 z6!3OsNv&^t!>*8_iG?9f_qtnG2vex=5m1+I;r}cLCHtNI_J0~qrsGVF$E#C`4uvWCN;3|m9VD|W&VZ!E zZ80}ePEf)}DoU_VuYHPTbskfY--FM2RLht0en(K1h z{B(RSrXY{{Q~gcX_Z4@^#pEZ6+uz$dj*c6j2)EhW)iJ4HWH_w33e4MR##X*@HoeYV zTR`eD9c*zk($0fnUU{Sc457F8VAf`m|9!Z{`+ZU!R$tDOn>@lEsen!*k{_vy=onLz zrDZiMC1?uEm3DyUf;@H<=+fPomG}Bnd$f_hXYE3I73wrSl?UgdDg4v6)Ab;|Ryx4Q zSJHjAZ>RLcocJBLwF&qg9in$DO+kR`W71NU7|EKOS?#;f!_lXT!JgSk4XE;Cwo&4BDj=)v(1dcQyBU za@p)U?+OvX6bpP-H?(`Y2r?832(3CtlNW}lNLaQZYSEzW<7CG1ZQb?k*aCs-pM>Xq z4iMN~-U;I6dOF}mJ3`2t$zSu~$!imy4&-9Zt(?3gZy~C&a|wiJh>RhAn>)=OqR)IN z(%@oGy=lrD;uVk(w_z)Kl=nVg8Vr?%(Z;A8MooT9G;dZ{>q=#!A7pzk#{&$@Z=ev9 z*n8DxMIgPx5$5DrK|M|)or)r*NCfR~lLL95YHbky^xUDKL(gz&k#Ul1(l&i=yQ$XV z%{&LJMH6vISTmcE zu<+)UX`oLS#Pg@iPFB6B1#HbV?QT}#dE2dUzATa;06DqX*?JEQgk)nBg9~W&V$4*s z-_4UfxXa~GXxgN66zzBtJ%T3#dnl7ze?IfvyS!?ztY}aAb^D&h@{z6-o;()OTTU~e zmfC0EE4TP}^E%$*v$|101>JVvw1EEa?_~Tb9p*LBS~OH01vEiB0~y=% z*jN2MS=L%DpG;JuPTi^-UWC=X83~fgpQV01oK=s50N31a;Sjo#>Gq9@q`Ch`hQ+>v zl%ZSdK#dx-LI0)OtfUan@Sgj5a7`zL1W%GvftJLJ`ef^ub1I{R*Yi}lrTz!s1FC0v zqwbfM&KL??WAqDJTQ`_elH+zp%%{l08g6a7-CX)vV?LNodwe=+f9oqS9AgNe5AClBk^smH3}3}Qbb?~OlOPL7 z0pDK1+k!mxVQxaQ+^wI9mjmL$)y91lW+wI2Y;BxX%ga$$P+6GydBUSL&19t{pC+3& zD`yrDMSc7DBu_Ee54Kn1=%=dTHo2ud$kSrD!w7q#2y*%8|B>gg87< zLU7c{A&+uX3i>&T^>duo0!WuHkZ8VdP+eWSpxVO70_b0EW)p{z)YtF;=fU+R1cch0$?ujQK%yzNQ~ zEoKFjds`6B6UPm_jK{Sm88n*CO6c zX;^oa#BbqTBPUxnei2-eeuMM2B_aniNZI}PL1=YjN@dcM-P)wpQH!|Yn$@a%I6+ec z*0~UDy4xlxW+wNLx<*$= zEg2e{k5xg2?cx`3AnQ1+e9&lynBoCl%o&Ud)hLwZW{CSR+m&b1hAKZ7BjGjVIEx;!_l5}w@|WKR z*83{7f?7*N>b~a2&!4cbY5&j+@MFI_0?^(2(x*li5h7yx*BGbL;j&_^A+W{+P+k-H z3)mR*tRKHZMdw%8;|PMs67=kw9Wrg_6ne=WQN->rgk9W~M+pg3SyZ~*P#+9MC8@)B zpPu7)^5u~I90FZXs~#&JK_I?lya4SxJPgV>==R5UZLu01I{$(QR{UE!A1nbf{|pT1 z&6!;_<~V@`{nl4nHf%!S$$W&0d58=0cYYkr7x!8mHf@A;iSX%`Q_t_d0aqsqWO3={ zwhDZbIrYBeU32c)~%zU3XmY|~E(3#0y>WB8 zSnjcwaR=(YD!@+?&QgIB$Pbl~6_8}~B|Z zEM^N|IzCn1m^99O^l(RYE1>nzA=Viy1MHoTkH64AaCdh{(bw2MeoARN8F!~I ztWwuZen-3{xQ5&&+O!z5o6*+Yb*z0Rd|Rw}emQs_IDFm})Os_tAbq7fT<;!sCGt_K zsw#MCE5J^I`;D+{(=G0wrK>eNWup`LCiCm>evONjv9r0Es;jfLgXPZ()-Um;9F!z7gOpf=c*bQiA*UEJep_TXn1dy(zCd$=E1s8EvQ=iX#bQnMpOGMmt6R# zd#&f`Wuo)ze&@m;_YBG{Qia-lg@mg(W)I5GX5Myw$KZa(E|D~)iI2*GEW&@jV9q4edC*E-wm>k9dZRCTmn#MZpB*U-$v-||rKaA}-k3*Ix zb}7klL?*LR)D7x*$-t~I&)QtbUxm) z_9sQ<&NjXxV2b#_6rum_v6uh=wm)wjl}8nO*)ZCuPtj9BT-HA@)D)ObvD)9rihu?d zxim=mb@<=j2--@$m2P)j(g%48a2fyrEM&r!f*e$Ath@CWM@%wV6?vErCc12OrOZ4%Gp{20>Jjo?xdQ>N ziG}+d)}b7}Mp~Z(`0Ugf5#u!6Q3-_ODXc!rbd;+fcve>>hu^Nhifr)1Mco&&9m|@I)~!$?(?+FD;1iltRwj^Ah24l`W}&D03%6hXOY;j347Q=Ox!vQYmk*zN+dcSy zYhXf<|B_*SkgQCcknLjww>H7U7CRjZ9=Mo`u1~2B70mns)8y|b>97;Ek2=~#m6<=b zz{jOu?PRX`nza&tqA*}Difs#aQw|mZ47qnGpZI!eeF~PYXrG1lQgiHqY5nrmuqky2PrHMX!^qbc1G!{M3IhGBOs{-e z;hgxw+O7bAvV-w;!Sn+03C<^5Y6;nHcJa8t5Z{7@PK zR7t(CG}Wk;ZM{w>=JY{5Me-=xH)B^KGc&tA-3e2=b)(YHLuvC5?rAs%`?gZOgt!f* zoxie_dpsQ6f4xclCpalCj|s2AFn$C#Q;5K?;G5K6Vh>%%|D5ul=(Z<~+JKL`yM-SRi+P(gnTU52YH_0bkU2PDaq^Jm-A&$Q9gQF zQbd|4?KvBARdJj+dHZ?7N!sZf>w+e`0%0N!?;P&KE6tlF+-8!naHZgEcKnOEx4GR@ zsn!aTWcI}^wMUfpS9dIR^AtBd%XakJ=EN#gX(YQNsu?9o+B;4Fi{af&<#?LGB}Mj-FvZ=5tRvIh0Ip z!VW(^)tDjd!9vNzRCyjbw*466Y1*`{0k+p^-wvNzbpG$i{!f?vZ!Ow?0=XpX9HJf! zE-g5aQ2zq?zchZgYk#607T1l`!-gRNo}<9{?lA3*kxl|a@&t%UrgDckGSy- z<=K_+@x9Kkw_4z;+d&3Uf*8C*<-a5ibF4ncSEPs{+dO-Tn)v15>XN|)=5o8|+f4I* zm`{wMV5OSz%k{yrp_#!XXaD(SQ_TzfFybG327K|IKbmd<%rN>`rEwTpZ*?C>^%to@<;!7wf~vldkoRzF|^;>@!*sGm(%|Yr9D=EJV5nZ z9Tyybf2;pBPW5k_25bD!df2ob%+KKcZwh~+)J^rbX#e<&K28e{j((xE_jk4bN)nIl zJg#tm+c78m>Hfd!-NzOlU+@05PzDYv;B@u-viINi{_BuFC_jJ|^9!uMhN%8LB9F(Y ze!HyyL+|%c)xUZE6Lk;p74=`;%Ex zei%LawI1N|1V7B+Fa5Wi^>4ZlIq}ze&?TmMtoxq~`6uX)bL4}CUnfrCf3ff=V?M^> z@pRO0gKz(9JHJgmw(@xV;J1}bFtLAv^3%%C(UbpsE0N$D_8+YL9BELJgZ&vr@geXb N-hjK^U+Esa{~u4+SW*B0 literal 12629 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 Date: Fri, 6 May 2022 09:41:42 +0800 Subject: [PATCH 11/30] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index bfe2b4ca1a..2f1659d4f4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -50,6 +50,7 @@ TOTAL_HOUSE_NUM = #{totalHouseNum}, BUILDING_LEADER_NAME = #{buildingLeaderName}, BUILDING_LEADER_MOBILE = #{buildingLeaderMobile}, + SORT = #{sort}, UPDATED_TIME = NOW() WHERE ID = #{buildingId} From 929aea9565d0e0e3364f573e3aae9694b0850d53 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 May 2022 09:57:54 +0800 Subject: [PATCH 12/30] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/dto/result/OptionResultDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java index 739d44fc00..fa96252e3b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java @@ -33,7 +33,7 @@ public class OptionResultDTO implements Serializable { */ public void getCurrenNodeAllChild(OptionResultDTO option, Map resultMap) { resultMap.put(option.getValue(), option); - if (CollectionUtils.isNotEmpty(option.getChildren())) { + if (CollectionUtils.isEmpty(option.getChildren())) { return; } option.getChildren().forEach(o -> { From 1caf1b92444329586e94aff76b0eb44efac4695f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 6 May 2022 10:08:21 +0800 Subject: [PATCH 13/30] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=EF=BC=8C=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=80=92=E5=BA=8F?= =?UTF-8?q?=E6=AD=A3=E5=BA=8F=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IcBuildingListFormDTO.java | 5 +++++ .../src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java | 4 ++++ .../src/main/resources/mapper/IcBuildingDao.xml | 4 +++- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 4 +++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java index 249a7d4c42..18aa756a8c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java @@ -26,4 +26,9 @@ public class IcBuildingListFormDTO extends PageFormDTO { * 房主电话 */ private String ownerPhone; + + /** + * asc：正序，desc：倒序 + */ + private String sortType; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java index 7fdbf31cc5..b57f0bdadc 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java @@ -65,5 +65,9 @@ public class IcHouseListFormDTO extends PageFormDTO { */ private String keyword; + /** + * asc：正序，desc：倒序 + */ + private String sortType; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 2f1659d4f4..482deeccea 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -121,7 +121,9 @@ AND a.DEL_FLAG = '0' - ORDER BY a.sort, + ORDER BY + a.sort, + a.sort DESC, 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) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index d4662df72d..514b0629ac 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -158,7 +158,9 @@ and a.del_flag = '0' #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序 - ORDER BY a.sort, + ORDER BY + a.sort, + a.sort DESC, CONVERT(c.NEIGHBOR_HOOD_NAME using gbk), CONVERT(b.BUILDING_NAME USING gbk), CONVERT(d.UNIT_NAME USING gbk), From c6b32326fd2b35e5a784f7134d8738221d685eaf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 6 May 2022 10:12:27 +0800 Subject: [PATCH 14/30] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=EF=BC=8C=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=80=92=E5=BA=8F?= =?UTF-8?q?=E6=AD=A3=E5=BA=8F=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcBuildingDao.xml | 5 +++-- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 482deeccea..2cc2fcd73f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -122,8 +122,9 @@ AND a.DEL_FLAG = '0' ORDER BY - a.sort, - a.sort DESC, + a.sort, + a.sort, + a.sort DESC, 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) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 514b0629ac..49472d0dc7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -159,8 +159,9 @@ #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序 ORDER BY - a.sort, - a.sort DESC, + a.sort, + a.sort, + a.sort DESC, CONVERT(c.NEIGHBOR_HOOD_NAME using gbk), CONVERT(b.BUILDING_NAME USING gbk), CONVERT(d.UNIT_NAME USING gbk), From 49d92147ade64adf2719895ad9f5046d1d0da9ca Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 May 2022 10:37:59 +0800 Subject: [PATCH 15/30] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=88=97=E5=AE=BD=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/EasyPoiExcelExportStylerImpl.java | 2 +- .../handler/ColumnWidthStyleStrategy.java | 96 +++++++++++++++++++ .../impl/IcResiUserExportServiceImpl.java | 1 - 3 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ColumnWidthStyleStrategy.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/EasyPoiExcelExportStylerImpl.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/EasyPoiExcelExportStylerImpl.java index b1a5606c2e..5ddff4ba71 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/EasyPoiExcelExportStylerImpl.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/EasyPoiExcelExportStylerImpl.java @@ -50,7 +50,7 @@ public class EasyPoiExcelExportStylerImpl extends AbstractExcelExportStyler titleStyle.setFont(font); titleStyle.setAlignment(HorizontalAlignment.CENTER); titleStyle.setVerticalAlignment(VerticalAlignment.CENTER); - return null; + return titleStyle; } /** diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ColumnWidthStyleStrategy.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ColumnWidthStyleStrategy.java new file mode 100644 index 0000000000..7e577e7c22 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ColumnWidthStyleStrategy.java @@ -0,0 +1,96 @@ +package com.epmet.commons.tools.utils.poi.excel.handler; + +/** + * desc:设置columnWith宽度 + * + * @author: LiuJanJun + * @date: 2022/4/28 5:05 下午 + * @version: 1.0 + */ + +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.util.MapUtils; +import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; +import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.poi.ss.usermodel.Cell; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + * Take the width of the longest column as the width. + *

+ * This is not very useful at the moment, for example if you have Numbers it will cause a newline.And the length is not + * exactly the same as the actual length. + * + * @author Jiaju Zhuang + */ +public class ColumnWidthStyleStrategy extends AbstractColumnWidthStyleStrategy { + + private static final int MAX_COLUMN_WIDTH = 255; + /** + * 是否 根据内容设置宽度 + */ + private boolean isSetContentWidth = false; + + private final Map> cache = MapUtils.newHashMapWithExpectedSize(8); + + + + @Override + protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List> cellDataList, Cell cell, + Head head, + Integer relativeRowIndex, Boolean isHead) { + boolean needSetWidth = (isHead || isSetContentWidth) && CollectionUtils.isNotEmpty(cellDataList); + if (!needSetWidth) { + return; + } + Map maxColumnWidthMap = cache.computeIfAbsent(writeSheetHolder.getSheetNo(), k -> new HashMap<>(16)); + Integer columnWidth = dataLength(cellDataList, cell, isHead); + if (columnWidth < 0) { + return; + } + if (columnWidth > MAX_COLUMN_WIDTH) { + columnWidth = MAX_COLUMN_WIDTH; + } + Integer maxColumnWidth = maxColumnWidthMap.get(cell.getColumnIndex()); + if (maxColumnWidth == null || columnWidth > maxColumnWidth) { + maxColumnWidthMap.put(cell.getColumnIndex(), columnWidth); + writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), columnWidth * 256); + } + } + + private Integer dataLength(List> cellDataList, Cell cell, Boolean isHead) { + if (isHead) { + return cell.getStringCellValue().getBytes().length+3; + } + WriteCellData cellData = cellDataList.get(0); + CellDataTypeEnum type = cellData.getType(); + if (type == null) { + return -1; + } + switch (type) { + case STRING: + return cellData.getStringValue().getBytes().length; + case BOOLEAN: + return cellData.getBooleanValue().toString().getBytes().length; + case NUMBER: + return cellData.getNumberValue().toString().getBytes().length; + default: + return -1; + } + } + + public ColumnWidthStyleStrategy() { + + } + + public ColumnWidthStyleStrategy(boolean isSetContentWidth) { + this.isSetContentWidth = isSetContentWidth; + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 70c2dbb55a..c684def65b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -278,7 +278,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { List listOptions = new ArrayList<>(); String[] split = vauleStr.split(StrConstant.COMMA); Arrays.stream(split).forEach((value) -> { - //todo 看看怎么更好的利用本地缓存 OptionResultDTO optionResultDTO = remoteOptionMap.get(value); if (optionResultDTO != null) { listOptions.add(optionResultDTO.getLabel()); From 4303f3cc646b60a9bb85d1f7851ddc09d316cda3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 May 2022 10:43:11 +0800 Subject: [PATCH 16/30] =?UTF-8?q?do=E8=AF=AD=E5=8F=A5=E8=A2=AB=E7=9F=AD?= =?UTF-8?q?=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserExportServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index c684def65b..996e675ff0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -201,7 +201,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { resultData.add(singleRowData); }); excelWriter.write(resultData, writeSheet); - break; } while (mapListPage.getResult().size() == searchForm.getPageSize()); } catch (IOException e) { log.error("exportIcResiUser exception", e); From 95ace290f7b92d8750cfe3617878ddefd1a80877 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 May 2022 11:07:32 +0800 Subject: [PATCH 17/30] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=88=97=E5=8E=9F?= =?UTF-8?q?=E5=A7=8B=E5=80=BC=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserExportServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java index 996e675ff0..0edf48b55f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.Constant; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.IcExportTemplateSaveFormDTO; @@ -20,6 +21,7 @@ import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Md5Util; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; @@ -190,12 +192,16 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { FormItemResult formItemResult = exportResiUserItemDTO.getItemMap().get(columnName); String newValue = vauleStr; + if (Constant.OPITON_SOURCE_REMOTE.equals(sqlColumn.getOptionSourceType()) && StringUtils.isNotBlank(vauleStr)) { putRemoteValue(exportResiUserItemDTO.getRemoteItemConditionMap().get(itemId), staffInfoCacheResult.getAgencyId(), o, originalConditionMap, formItemResult, columnName, vauleStr); newValue = String.valueOf(o.get(columnName)); } else if (Constant.OPITON_SOURCE_LOCAL.equals(sqlColumn.getOptionSourceType())) { newValue = putOptionValue(formItemResult, vauleStr); } + if (FieldConstant.ID.equals(key)) { + newValue = Md5Util.md5(vauleStr); + } singleRowData.add(newValue); }); resultData.add(singleRowData); @@ -241,10 +247,10 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { } IcCustomExportResultDTO data = exportConfigResult.getData(); - //添加一个虚拟列Id 用于分组 - data.getShowSqlColumns().add(0, new IcCustomExportResultDTO.SqlColumn(null, "ic_resi_user", false, "ID", "local")); + //添加一个虚拟列Id 用于分组 合并单元格 + data.getShowSqlColumns().add(0, new IcCustomExportResultDTO.SqlColumn(null, "ic_resi_user", false, FieldConstant.ID, "local")); List id = new ArrayList<>(); - id.add("ID"); + id.add(FieldConstant.ID); data.getHeaders().add(0, id); return exportConfigResult; } @@ -336,6 +342,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { } break; default: + return valueStr; } return valueStr; } From 7b9300be4c957459aaf6c56126da916291bcba0f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 6 May 2022 14:02:15 +0800 Subject: [PATCH 18/30] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=AF=B9?= =?UTF-8?q?datapicker=E5=92=8Cdatarange=E7=A9=BA=E9=97=B4=E7=9A=84?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=BF=9B=E8=A1=8C=E6=AD=A3=E5=88=99=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E5=88=A4=E6=96=AD=EF=BC=8C=E5=92=8C=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 82 ++++++++++++++++++- 1 file changed, 78 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index d530aa9f34..c3ec181ef2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -85,10 +85,24 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res public static final List controlGroup1 = Arrays.asList("input", "textarea", "datepicker", "daterange"); public static final List controlGroup2 = Arrays.asList("select", "radio"); - // 身份证号的正则表达式 + /** + * 15位身份证号的正则表达式 + */ private final Pattern PATTERN_15_ID = Pattern.compile("^\\d{6}(?\\d{2})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)$"); + /** + * 18位身份证号的正则表达式 + */ private final Pattern PATTERN_18_ID = Pattern.compile("^\\d{6}(?\\d{4})(?0[1-9]|1[0-2])(?[0-2][0-9]|3[0-1])\\d{2}(?\\d)[0-9a-xA-X]$"); + /** + * 日期解析，不含时间 + */ + private final Pattern PATTERN_DATE_PICKER = Pattern.compile("^(\\d{4})[-/](0?[1-9]|1[0-2])[-/](3[0-1]|[0-2]?\\d).*$"); + /** + * daterange的解析：1992-01-20,1992-01-30 + */ + private final Pattern PATTERN_DATE_RANGE = Pattern.compile("^(\\d{4})[-/](0?[1-9]|1[0-2])[-/](3[0-1]|[0-2]?\\d).*,(\\d{4})[-/](0?[1-9]|1[0-2])[-/](3[0-1]|[0-2]?\\d).*$"); + /** * 身份证号列序号 */ @@ -149,7 +163,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res private OssFeignClient ossFeignClient; /** - * 字表中不需要的列 + * 子表中不需要的列。因为主表中需要身份证号，网格等信息，但子表中不需要这些列必填，只要有身份证号即可，因此字表判断的时候需要排除这些列 */ private List subTableNeedlessColumns = Arrays.asList("GRID_ID", "VILLAGE_ID", "BUILD_ID", "UNIT_ID", "HOME_ID", "IS_BDHJ", "NAME", "MOBILE", "GENDER", "ID_CARD", @@ -621,7 +635,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res columnAndValues.put("BIRTHDAY", String.join("-", Arrays.asList(year, month,day))); columnAndValues.put("GENDER", isMale ? "1" : "2"); columnAndValues.put("IS_OLD_PEOPLE", age >= 60 ? "1" : "0"); - System.out.println(6); } /** @@ -695,7 +708,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } catch (Exception e) { String errorMsg; - if (e instanceof RenException) { + if (e instanceof RenException || e instanceof EpmetException) { errorMsg = e.getMessage(); } else { errorMsg = "未知系统错误"; @@ -792,6 +805,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res String notFoundColumnName = null; List emptyColumnNames = new ArrayList<>(); + List patternErrorColumnNames = new ArrayList<>(); // 这两列要提前放进去，因为有的列未填写的话，会抛异常出去，需要用这两列来做描述 target2Insert.put("ID_CARD", row.get(ID_CARD_COLUMN_NO)); @@ -823,6 +837,13 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res continue; } + // 日期控件的数据校验和清晰 + boolean dateError = dateTypeCheckAndWash(columnWrapper, patternErrorColumnNames); + if (dateError) { + hasError = dateError; + continue; + } + // "select", "radio" } else if (controlGroup2.contains(columnWrapper.getItemType())){ @@ -916,10 +937,63 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res sb.append(notFoundColumnName).append("填写的值在系统中未找到"); } + if (CollectionUtils.isNotEmpty(patternErrorColumnNames)) { + sb.append(String.join(",", patternErrorColumnNames)).append("的值格式错误"); + } + throw new EpmetException(sb.toString()); } } + /** + * 处理一下日期类型的数据 + * @param columnWrapper + * @param patternErrorColumnNames + * @return true:有错误，false，没错误 + */ + private boolean dateTypeCheckAndWash(ColumnWrapper columnWrapper, List patternErrorColumnNames) { + // 日期格式不对的检查 + String cellContent = columnWrapper.getCellContent(); + if (StringUtils.isBlank(cellContent)) { + return false; + } + + if ("datepicker".equals(columnWrapper.getItemType())) { + Matcher matcher = PATTERN_DATE_PICKER.matcher(cellContent); + if (matcher.matches()) { + String year = matcher.group(1); + String month = matcher.group(2); + String day = matcher.group(3); + + cellContent = String.format("%s-%02d-%02d", year, Integer.parseInt(month), Integer.parseInt(day)); + columnWrapper.setCellContent(cellContent); + columnWrapper.setColValue(cellContent); + } else { + patternErrorColumnNames.add(columnWrapper.getCombinedLabel()); + return true; + } + } else if ("daterange".equals(columnWrapper.getItemType())) { + Matcher matcher = PATTERN_DATE_RANGE.matcher(cellContent); + if (matcher.matches()) { + String year = matcher.group(1); + String month = matcher.group(2); + String day = matcher.group(3); + String yearEnd = matcher.group(4); + String monthEnd = matcher.group(5); + String dayEnd = matcher.group(6); + + cellContent = String.format("%s-%02d-%02d,%s-%02d-%02d", year, Integer.parseInt(month), Integer.parseInt(day), yearEnd, Integer.parseInt(monthEnd), Integer.parseInt(dayEnd)); + columnWrapper.setCellContent(cellContent); + columnWrapper.setColValue(cellContent); + } else { + patternErrorColumnNames.add(columnWrapper.getCombinedLabel()); + return true; + } + } + + return false; + } + /** * 必填，但是用户没填的，放到list中 * @param isPrimaryTable 是否是主表。true：是主表，false：从表 From cd81ac7b6aa2878c116d37d72d9a7d362402a5ce Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 6 May 2022 14:15:01 +0800 Subject: [PATCH 19/30] url --- .../main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 0029c42100..07bf76bfa5 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -23,8 +23,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:09 */ - @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") -//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) +// @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) public interface EpmetUserOpenFeignClient { /** From 59770de0cb6d4ffa3fb871a4d538cd89318f0428 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 May 2022 14:29:16 +0800 Subject: [PATCH 20/30] =?UTF-8?q?=E5=8F=AA=E5=90=88=E5=B9=B6=E6=94=B9?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../poi/excel/handler/ExcelFillCellMergeStrategy.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java index bff1f1a999..54f395bbc9 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java @@ -23,7 +23,7 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { /** * 需要合并的列 下标 */ - private int[] mergeColumnIndex; + private int[] mergeColumnIndexArr; /** * 从下标n行开始合并 */ @@ -32,9 +32,9 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { public ExcelFillCellMergeStrategy() { } - public ExcelFillCellMergeStrategy(int mergeRowIndex, int[] mergeColumnIndex) { + public ExcelFillCellMergeStrategy(int mergeRowIndex, int[] mergeColumnIndexArr) { this.mergeRowIndex = mergeRowIndex; - this.mergeColumnIndex = mergeColumnIndex; + this.mergeColumnIndexArr = mergeColumnIndexArr; } @Override @@ -56,14 +56,13 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { return; } //如果不指定 合并的列则全部列进行 合并判断 - if (mergeColumnIndex == null) { + if (mergeColumnIndexArr == null) { mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex); } else { //合并指定的列号 - for (int columnIndex : mergeColumnIndex) { + for (int columnIndex : mergeColumnIndexArr) { if (curColIndex == columnIndex) { mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex); - break; } } } From 51cb74e77f73b9dbdab1200f410a7afd51f4c70e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 6 May 2022 15:03:49 +0800 Subject: [PATCH 21/30] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/CollectListFormDTO.java | 4 ++++ .../epmet/dto/result/CollectListResultDTO.java | 3 +-- .../controller/IcResiCollectController.java | 18 ++++++++++++++---- .../epmet/service/IcResiCollectService.java | 7 +++++++ .../service/impl/IcResiCollectServiceImpl.java | 14 ++++++++++++++ .../main/resources/mapper/IcResiCollectDao.xml | 3 +++ 6 files changed, 43 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java index 368db969c4..decce16f25 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java @@ -28,4 +28,8 @@ public class CollectListFormDTO extends PageFormDTO { private String userId; private String customerId; + /** + * 查看详情入参 + */ + private String id; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java index 2b95eb5e04..f4bd2a1886 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java @@ -1,6 +1,5 @@ package com.epmet.dto.result; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -21,7 +20,7 @@ public class CollectListResultDTO implements Serializable { */ private String houseHolderName; - @JsonIgnore + // @JsonIgnore private String id; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java index 54314229cf..9c96f77ace 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java @@ -20,10 +20,7 @@ import com.epmet.dto.result.CollectListResultDTO; import com.epmet.dto.result.LatestCollectResDTO; import com.epmet.service.IcResiCollectService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -81,6 +78,19 @@ public class IcResiCollectController { return new Result>().ok(icResiCollectService.getCollectList(formDTO)); } + /** + * 信息采集-详情 + * @param formDTO + * @param tokenDto + * @return + */ + @PostMapping("detail") + public Result detail(@RequestBody CollectListFormDTO formDTO, @LoginUser TokenDto tokenDto) { + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result().ok(icResiCollectService.detail(formDTO)); + } + /** * Desc: 查询采集居民信息 * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java index 9129b34675..17b6031472 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java @@ -49,4 +49,11 @@ public interface IcResiCollectService extends BaseService { * @return */ LatestCollectResDTO latestSubmit(LatestSubmitCollectFormDTO formDTO); + + /** + * 信息采集详情 + * @param formDTO + * @return + */ + CollectListResultDTO detail(CollectListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index fe75c7acbb..5caeb3a008 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -115,6 +115,20 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl list = baseDao.getCollectList(formDTO); + if (CollectionUtils.isNotEmpty(list)) { + return list.get(NumConstant.ZERO); + } + return null; + } private IcNeighborHoodDTO queryIcNeighborHood(String villageId) { Result res = govOrgOpenFeignClient.getIcNeighbordhoodById(villageId); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index 28e1e8370a..ebfe3767fd 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -39,6 +39,9 @@ AND DATE_FORMAT(c.CREATED_TIME,'%Y-%m-%d') #{endDate} + + AND c.id=#{id} + ORDER BY c.CREATED_TIME DESC @@ -203,7 +208,11 @@ ${groupTableName}.ID - order by ic_resi_user.CREATED_TIME desc,ic_resi_user.id desc + order by IC_RESI_USER.GRID_ID ASC, + IC_RESI_USER.VILLAGE_ID ASC, + IC_RESI_USER.BUILD_ID ASC, + IC_RESI_USER.UNIT_ID ASC, + IC_RESI_USER.HOME_ID ASC From ac71a67c310cbb3ed5199afe304d82e88070efaf Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 6 May 2022 17:01:17 +0800 Subject: [PATCH 24/30] =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 1bff30a5ca..2f3b12f380 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -810,6 +810,7 @@ AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' ) + ORDER BY GRID_ID,VILLAGE_ID,BUILD_ID,UNIT_ID,HOME_ID, convert(NAME using gbk) ) t WHERE 1=1 @@ -819,7 +820,7 @@ AND natCount = #{natCount} - ORDER BY `NAME` + @@ -212,7 +213,8 @@ IC_RESI_USER.VILLAGE_ID ASC, IC_RESI_USER.BUILD_ID ASC, IC_RESI_USER.UNIT_ID ASC, - IC_RESI_USER.HOME_ID ASC + IC_RESI_USER.HOME_ID ASC, + IC_RESI_USER.ID ASC From f9d4b2c406a03bbdca45922764d93fec2e9b84c6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Sat, 7 May 2022 10:41:12 +0800 Subject: [PATCH 27/30] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/BuildingServiceImpl.java | 9 ++++++--- .../src/main/resources/mapper/IcBuildingDao.xml | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 4e8ccd0e93..3476d797d1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -157,7 +157,10 @@ public class BuildingServiceImpl implements BuildingService { //2.获取组织所在网格 List agencyIdList = customerAgencyList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); // agencyIdList.add(customerAgency.getId()); - List customerGridList = customerGridDao.selectList(new QueryWrapper().lambda().in(CustomerGridEntity::getPid, agencyIdList)); + LambdaQueryWrapper gridWrapper = new LambdaQueryWrapper<>(); + gridWrapper.in(CustomerGridEntity::getPid, agencyIdList); + gridWrapper.last("ORDER BY CAST(gridName AS SIGNED),CONVERT(gridName using gbk)"); + List customerGridList = customerGridDao.selectList(gridWrapper); if (CollectionUtils.isEmpty(customerGridList)) { return covertToTree(customerAgency, agencyList); @@ -182,7 +185,7 @@ public class BuildingServiceImpl implements BuildingService { List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() .in(IcNeighborHoodEntity::getGridId, gridIdList) - .orderByAsc(IcNeighborHoodEntity::getCreatedTime); + .last("ORDER BY CAST(NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(NEIGHBOR_HOOD_NAME using gbk)"); List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); if (CollectionUtils.isEmpty(icNeighborHoodList)) { agencyList.addAll(gridList); @@ -206,7 +209,7 @@ public class BuildingServiceImpl implements BuildingService { List neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); LambdaQueryWrapper buildingQueryWrapper = new QueryWrapper().lambda() .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList) - .orderByAsc(IcBuildingEntity::getCreatedTime, IcBuildingEntity::getBuildingName); + .last("ORDER BY SORT, CAST(BUILDING_NAME AS SIGNED),CONVERT(BUILDING_NAME USING gbk)"); List icBuildingList = icBuildingDao.selectList(buildingQueryWrapper); if (CollectionUtils.isEmpty(neighborHoodIdList)) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 2cc2fcd73f..7387a73354 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -186,6 +186,7 @@ ca.del_flag = '0' and CONCAT(':',ca.pids, ':') like CONCAT('%:',#{agencyId},':%') + ORDER BY CAST(organization_name AS SIGNED),CONVERT(organization_name using gbk)