From fe75dcfc5bc313c940d6f8eda564ebc4509846ab Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 21 Apr 2022 15:26:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcHouseDTO.java | 5 ----- .../java/com/epmet/entity/IcHouseEntity.java | 5 ----- .../java/com/epmet/model/HouseInfoModel.java | 3 --- .../epmet/model/ImportHouseInfoListener.java | 17 ----------------- .../V0.0.17__edit_building_and_house.sql | 1 - .../main/resources/excel/house_template.xlsx | Bin 9649 -> 9529 bytes 6 files changed, 31 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java index b2ccb2c1d2..2bec463b9b 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java @@ -73,11 +73,6 @@ public class IcHouseDTO implements Serializable { */ private String doorName; - /** - * 排序 - */ - private Integer sort; - /** * 房屋类型，这里存储字典value就可以 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java index 96ddb46fc6..4861c69271 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java @@ -73,11 +73,6 @@ public class IcHouseEntity extends BaseEpmetEntity { */ private String doorName; - /** - * 排序 - */ - private Integer sort; - /** * 房屋类型，这里存储字典value就可以 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java index 332fc6b6bb..740892f4cd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java @@ -50,9 +50,6 @@ public class HouseInfoModel { @ExcelProperty(value = "房主身份证") private String ownerIdCard; - @ExcelProperty(value = "排序") - private Integer sort; - @ExcelIgnore private Integer num; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index 515e8127bc..31471fb3ed 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -154,11 +154,6 @@ public class ImportHouseInfoListener extends AnalysisEventListener0) { - Pattern pattern = Pattern.compile("[0-9]*"); - Matcher isNum = pattern.matcher(str); - if (!isNum.matches()) { - return false; - } - return true; - } - return false; - } - public void disposeErrorMsg(HouseInfoModel data,String msg){ HouseErrorInfoModel err = ConvertUtils.sourceToTarget(data, HouseErrorInfoModel.class); err.setErrorMsg(msg); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.17__edit_building_and_house.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.17__edit_building_and_house.sql index a737175597..1117c368b7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.17__edit_building_and_house.sql +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.17__edit_building_and_house.sql @@ -1,3 +1,2 @@ alter table ic_building add COLUMN BUILDING_LEADER_NAME VARCHAR(11) comment '楼长姓名' AFTER TOTAL_HOUSE_NUM; alter table ic_building add COLUMN BUILDING_LEADER_MOBILE VARCHAR(11) comment '楼长电话' AFTER BUILDING_LEADER_NAME; -alter table ic_house add COLUMN SORT INT(11) comment '排序' DEFAULT 0 AFTER DOOR_NAME; \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx index 37c0cc1c02b9a740d5135585b1bff8f7ed773a72..31d9ea9120972eda2819859009fa0fdc195ddfac 100644 GIT binary patch delta 4845 zcmZ8lS5VW9vkkpVks4}90)#FgARvS)9U@JLpd!6XmjFNMRaywrI|xFMCcXEfDDX)~ zx=4{AQWfF)&D=Zp{_j5Q!_LmxhqJS@=hW%7>ei+ck)isu&P=gcL_C11UcV&sFd=-U zX!DDJd-E-|#jr8M8>Axf%_$x3g92hYjf)nC--A z<4&4X`YgfeHypgNXmPjerHvlQz&cBfEKGonn}S zku%9{`=IcrLaO2Q*CSl zyzA|QTYhqH9#!~Ta2aP%8n%)bCzFZl~fMETbS=%EFP-cn^7jPT8_??K01bhB)mHD}!e6@wS3 z%$TR(L0>LjhO-yd;~|%jdd~(*l6s;Wj2Egn5>gQ8H8lvt4#I}P!N8z7+LKe0IrQGT zN}^V*;B5Pzt8GV3w!FuZzht{Sk&SZ2)G`)$I*E@_`~%y0QsC*3kze&0Hicejd*1cOC)R^XyA-iQ>&8Z3Cgtlv1!v;revBA|jL-<0ON*mKwQ6 ze-#&6I4%8rG@01rvs=48S!9&F{kM@Euh_}h=Zz8_@`Xi)IrFfBC5CTT(Nygacp&V|9V8*0WeKw+mdPU3{HyiCGoYY z4`nIqObvE=-0!29+Vu+|x0hUi=-dMvlww6}E zIwXnKi&9|GOAyqrt@NSXH^=*6Jp@@b9GCp3Irqlp;>(u~?e@WzdX7~evo=(xK=iPq zo!Ehgo-|jn7eLVZdbYLuZI_<)(gOL24iSg;^p}F*a5oDyd)xyb)~UM+Wn8QV`>V4z zxpI31sWW%16N$a|*A+HT0&b)$uYDQ-o!FLX*2cn0^y0uY#UJ3Q)1q2IP<{$o6Q;E3 zH=dV!wX`~{3+opJKV^HOt)<OR`PX>3UkVti@;*@evhz%d0j6*OJ> zne&5r`zlS6waL|2;Yq*ym7zPTSqG}T{_E;}9KkuGQA&(43~Jo64@0STu#`!n6X`>- zUg8eu+{k-7r+KmSl8LsRMmYYBV>^?_OR4vPk=$E%+ly*CYdA)42^tc<57&MAyS|s- zk9G*S3kem0M@HQ_fM0fvFCO0Lx>fSasD#v64`q|9QqZk{f3I@!ZGHQr$WO;d?~S_O zzW->G-JCEh@s&3eTb-xUt)$rgi`~W$Xbb$abDc9>8y$TzA<2m=%e@Lb5-T;!Qn@$* zcK0MifY8(a&lgpk8V^&59UhY|5N_Ua_@teiRG7T)!fAynSCTSn`Q zD5Ady>?=0QIftK0y(?B0Zo+q3$wKr=80a0Kz7^h@%JlV{mzgUa`&Ls3Tfb_#U;rBU{ZYAgal$gN3P8a zC4oppFYbj4H{%Fb!JA}nuL*lM{SULfw=fnprZXbA#j(9KPoPcq8Z%`7@=v?}OR0-1 z_cGI@9NQu#AjDsArYmU@*lU+2CJNwgO<{yF) z6=5$$Vn4<@!q{1@C}<3^Kk{YaGCUJ6l0h|T1ZAzU!v@$Z{CBBYE$%M>(8(P zd+JR~J|8&3a-6xTr)`TK8UGs#7yh)(2wAD2CJr!p! z@KgtJ58%W?WaN_ej`CTxF#h&F8$Hy-i@ceK@0fU26ckh5YEH%XEdSmI>b2(Lti%6yTdrsC+x84+G#&%6D=*b6o3kI6>v* zR-Ups(Kcp2W93?+Dv#u1NcvB}7k0U=9dxd83yOC}r}WS5L`Ap;P;@prnrcTD;ZM@l zFKjb^t1N~IMtZh)J$1OT@(E_jYEF#Eypy;Pk3&+Aew+=pdE?)d=&!s5-P`3<6W%*b z1TZzrvh^7(*^xo%!Kg9!+aLT5g`77@wEnSvTbcpAxQO;`I;_!92J8J43oiOoacCoX zbzH~FQyOr$o5s~tw?(Pcd=-*my}0D{-3IiunXvyIdmR>l)bf^~>`>ClR{N^3To@bafD- z_S%;^^_J(;ahZg-f#s&;bgjvZA4D}+)3gigQv~peP&C+%W<;TF-VA=XlbX)G?!S{P1@=Y>FI%X!0 zh^ba^Tnf8Tf43kmr=5c0t)V78RTc-LJ${;migVd?GNKG@FlR)Xi>jaB@5ans$aK`uN zP_Z=xVA$c4AfcqiGVMbdVO5uI_dDwW?uC$67IA9+Nh#H5m?7#WwQexbgmX14@kN+7 zAz2b#4$6+ptweo`A+%8))Qi&&la`TnJudP;6=Y*EJbPz$DJ)-O1idwgYSwv0mrdi%K9RxsVYnI;Fj;lw8U z%(VX2-QZQ&@Us@ksSlu(RYxe)^1(+2(IFZY@Y+}?Mm}a&`d+1yYE1lzNV+PjAODb- z!FWr2e}HsslOJOy7!>_eTjzxF__eXv#7%x;(EheMnb3Vd`(zr0O0`!L1p{$Y!naon zs;Y@9B!s;~!#o(d7@VpGxffG2UJbncmReD3q*2l65}uY4_!C$FJuwttyrLrO`bC}k zF<|pvo%p^Fxi^e!=))~}Kf{WjC(vEoBgjnaEGDmu7&HI%EtcE_+0O-vo%kR&yT&pf zZYxt6LB7vA@UjBz9A)5VnzZU37Cr?2AVhgWDVgF^JsxV_?qxT@0 zVptpFduTmSa0d_p>yC^Q%o~4Q?e1M`=YOi17`64Q$zZo+DnfJ=1W|E--ojOU!x3EMB#;JYb z@xTok73ALy<+bco^nN&({qZsVVpuuVE{-7NI(A+q@e#Os=6Upc;|KQMc0p+HY1K!T zz?!EuBsmON@bZlG2Ti?o;;5u&kdc>WVe>cQ#F@n8@AmQ(ziwxL{Z1ZpdhB2MMI#s!*b9|d`y%JuoR2Gw)44NRzjccu4fyXwnMHMOjKHK;)9RO|JT!Urk zt%&EaiaZ0@*tE@sY>$MO>68twkCHzQcV7-}5_q+wMrjT8HCCiE%XK1Y2IL}XbYe60 za9x?NvgukB?Vx>zuiEt2!yeExKC8_Zivx=9D5dViL#6IfFKNhfb@>h?&-a8f#K}6o z211|zip3x!d8$`*v|&84W^5=5%rK00g3xugz60D8H;K#>I0@ok+E|S{oGxQ$FHqXB z)!gj;${kl8XWQCqx6K@#FS8|ht(3p?#}k(2zx?ds9Oulm6F2Z|jKGE>^Pyxi5G+{E zyWFw6Tn*UxeI`&4Jm@?KCP%Zu8cUddkQW+q_3e1; z9--jR_SHrIHg+Y~i=4l>RA)?S5TU`5Vao7O#v97U?DUtV^+&(R-Cq>8 z{o@zMxEl0gG}FLfcZ8!SrIp=us}v4~vTRXX+NqUJ^)WcWW2h{(Rb^@eC4M|F#sf?C zb`&t%621Az`a2rOh|*E_yy^D75vVrK!J_!6qd2@NlWwzPfI<}S_(s`RJd^dS;0xK% zmZ%x!+Er`rw#nSHQ&3{fa)XwKR{}6EJUFaUNLWTD_O*M+2Xwrscfzf2$c15Gp4ZntNT-&muiUC@iJw>vxEb-IID@Kd1_Qqh;I zE1%WP3N9wQyQY717R}PkC?5X8&FbY~o2d!v zhwO?QbLO&gpm>gWVM~`P#(E^A%zs~7N>Gg9I#OPRip7fv1lk}5ftW$q2rxUaqD!pG zOn&&gFyO)0uG3^=*7ikfBV+p7Z>8aiA`{Gh&G+wT*rq}tQO2nBrspV~suL-Ue{-`F zo)5h3-L;Y>eR%8FSd(>nlUEiimo1;4jVhA>haj5o4hjA(exfW@BTKX1d=fH;RLm@9 z@$uJsovt%#twxvbSluW(E`tSzn>4rcm;~b7E$1fUGiAJG8FXD{IhNF9mH>tVFk0%@u^ z;li-lCamxf16&vr*P_YjVcpAJ%~?XYO{o0tNq7+_6*|h0;+Mr*D@C62byK!4)>nZW zkQ*Dup3*Cy%dpF>)s4OWaTP)wOkLt3S^dM=1vNSKrmeBCGCOU`RP!Py1#9FIO7x$E z#5M466_OD}V!I(o;(abG5x*1>16GC~`` zGP_%B(~v~F`wAYtd-LqcR}%IyOxxYsMG@wbnQwmc&5(GuDGTozw8<-(AQ}+lf#j9Q zFG(#Rm3X|*Sb=mZ4SnBBxxe96128fMHm~te}z;ar72}U=1vn&Ric7FeFw1ZQ^i@wpd!*n!Qa$OS1qhCzfD)uNmpfnad z;u@H(bh`U||N3}y5#vF&xnRMJQ(d@YFLMy*+jRHx8spz-$7-#2KoFiY6Lr=PmAlc! zWj04?Na)n3p-;vcA<<+U5%SPXJ?d}Fb%}C6`(I+%;QWwgbR4;uj0VI5AZ>jge~9!O zvk3#T0Sd3T!ZUpY005E;lf?unf2>9oPp)^@*TmSanu{B^iByr$K2O$T?fTfAH3V8 z7MbH#-yyDyoCw0O1pdBFJ%8+NqjN5Q9f1cB>zL0OigVG*#GhG8@pGspxX-&XZ*fPD zsHLNv)~91}I#$Y2hFA_3e`|g3GC1}ixK+xi+zi7-&3Y)|O`$jI9SSn2+-ZVz8|bQ8 zTPh&1hlpF04E!_yHHlZ32_u#y9mqA(R1Q};UsJ#~m<;7R1SpT#l60NS62`!B0m|S` zv`3-V4)@R}n>6dE|Hm7)!o=ScT8DITpUGLyZqtsm8>nF9E2Y9zf4OQ#-)Ic^hz}MB z?b#B@Rr3|3@xEl#C5vR8Fj!QaAvTLM*aW^chpL)Inu9kQs0i`AYXe_yGALevT76$~ z=Y+}FUF4{A;%Iu}$SfzBp39L5O%zfxE5#}BdLdeR6lSRL9G19Q7kr>WO+ygAhgHX! zHM0mAvy}C!GK02Ae*^V=u&y_ay1ovXu}%;(X@nU^%tiM_fxIDsjX@8c~fS+G)g89C1C3n2sZEq!DI9)Wr-)Le-@V$f>M4WOb5S)npl| zRpthQLYkz-OsGDS0ZGU{n*mAaK9>PW2tS_zNhseMLsSi#e?~%$Yva{3!6Xv1kO4_# z1`eR4B!xs~u163Mf1+9;!R5vn5;858%|fwMu2d6r79&*otfSNXh0OU(k$M0fnEt-j4x?&(}M$xQC}hrGsXuq47+Pl_uG8XcD=q_ zBEFA%(YfY>e{o(2E@H;$#0Jfqb#)Q<88(|A-05@q;po|$(fzl%;O{@fpZhO^pSPlw zx;}x{^*F2llqIA+#d3JC9qer7f`@m9ub$+BFMkNOe$54Y&(zcK^|!%izl3WC+oQd` z!w2xN_1EzAcmHo3?Sj@W*4m~~f-A0)j_K&$3kWM0f85(YeEwtZ_|YGS2Rj#KJg_+< za8G(fV9DVc=)r^~iCD2Qj8zw|8=?wng-Ug29zS?|w7Wan{^s!MKFo${rGbL&7s1x2 zM?0^ApI!!c9|upL5BI+|4xfB}{QcX}S6>X@?2aD(9{lzQ+9E2!rAsiGT*}Y{y7phn zEm41Pf9-ov@Jm?qD0B}aU1%O7UxnTj(cBO{NbZH5vdSe~_TgU}CQky)jeHqcn3eIT zinK20AX(ND3>#{{Wg`2Y=3!8InSKJAz=XgBh50jV;|B7$kOEVwrjux+R_GHlKzr_O zD(w@>YQ)lf3p1jOFvThZyrfU2>E=IBO9KQ7lZFHpvI!>!1^Vf~7^;&j4;p`MZ`;-t z{yt#;fl#o02xg0{RA6@)kS)!;wMc;>?XndG z*0u1m4~w^T!y0r=`e!1={?xy)bMGbZi*)(oR-)(_h$M>Vo^zh_oO2I(FST*~aOf&` z?O^2iUb~{Ls};redVb&W_S%1yAK$jtS`}p!cD;Vr^*y^?IkHEU>zm*H*2XA2a_w9D zwjC-kgg0te_QUYtTD3ar?c2ldXx%@sJ@{te2g7a%AA`N>=peAW{Sguxx>a3O8`WXg z@hY1e-gsyY!;#YS$6na381#@rzWG5P4jL7OjMnk{V9FikyFVZM;cI_ieR)FOTve`o z@5&W*T~+TWuSvfB>00{tWRx}Xa{W3UNgg%#8M{%8a_Jk-0g?*JsC< zJDcjM{7b>jbSJf0BO)iU6!kFrlsIlRitgsd!1q{?bq%77j%;p>-c;^(UErUN!R`)i z@_BOl&dcYI(6QcrHyD2b*T`u#10Aap;h7;ce7f)Yff51}fhhQhmo=!0_7@E6w4H4mIcZd%94!0S@_=~1DE2R*=f{^^={!w zmjvfh=Tfe2MfnDd)E0|m#yo&%X)P$habq%q=EiYd+S9_cPmXME9CX9b4m=CKR-*T} zj}D+y@u0^>RIPs^$;`9&g6@%~(*Oh-znxoW8^m9dIB`H;B_^%|T zxcC>VpK`s^F_&FFV_muhe@o7*SeMmlc6OGmD{5}I94eN>k*_!E=&u-GxqKx zd02`61=W9Cu18o2%v{Z1iT>tAr#5_93m4M6e$afd%o9o;cYdRh+mN;EN;O%R=X1J<8>%<3$8m3{b<>sicX3~ z&pa2~fKA9e70isS%siJklkE%mC_^D0e`xoe@eqHIBTmxPBhVncvQ@-m32;R-`j(FV zP>3@@o0rIdZeAb@zTwnaES&5UU3fSIUgyY4MCWxO$<(~)69H8>n_y8~bs z1zMFxyB5$}xS1QhB~uUiu({E7ojq@8d$6o+2cgqLOW-~DXa~589uAU+MSCHlVRdLL z_;Ho)!GU}9qw#Rp4lKO;0$YKPZsCcPeZGGYTfh$84E)gUg?K**nrFX(k!brsWF)j6 z<+PClvIcuP%4sAtJQPW|N6c9Xu}=wiVd1Sos7neRhg`YhOZGF7DuH(U$g2biuLaeF zrKkm`vQNe4G?y=Wx$uOG*tqCkN;qNhtE4%^$6TmBP?l1v&&r5d1G~yujW{IBl{|lF zf{8j7&PFuvloLn|?$yT?QxlqtRnCYUbg;Xztk3~MF?4!)1I!r-u`VeK(VP>v;Q|W* z*V0r*t_{~qJI82n4?KoaASGCwf}|z1LQC#`L)9Z_9;nu1y`e8diN56EFi#0N-*reN7IIIS` zkcrx|%X3Y`r+T@jZUZI!rNfi!*Dgy9$Rex!?quQl1#rf6;7D65ZP`Ni{sw9HiOPp7 zXK`tJPmZlZ!vxhLtqlB7v+DKA4c99rL6Iv*dU+>w7HSQ$shqLqZgK$y znT>#O!LhFL%kN|{o?C~nf30PB<#4co_4uTc4MB~^Ct$@>33~Xw8?U}!eEpx(Cy;wi zAL*&#Fb>t?wL_1@7?E2$v4(%^nM64D{lIw>W)^Nk#5aOSpe=k@c1Q$$bD*#wDCh?) z?3;l-a1POi!(5cWNdUCxHlv7JQD~AV=%M{~W%BIV*^{?8uXo3e3(vn1+QYV*S%HT7 z9c4|KeDV3&KkrZfa6EbX`26D!&wlr*0(~8U4t(MUspHLOv!m!qqdi8X>KCjpI?M5B>pH>e|a!z9OzQp5ZHb9+xm zK}|BVzD6DapSAu!PbSZP73)QuHO#7&z(p0JhL?%g@NV2$`B#5>G5PIprvG>^ z)`>3Km=NA5Ju8z)7l?mvL>H70Y?K;)gdz7Z0CzNuNIOFcnFIl5hsZeC@FR(TqB}H^ zHIaC5zu+RnQ2OGXJPZ}s48g zZkY&q!g`jilh01+`68=yX<|)3xi|gu$>ibtlLz;wAALb(MJmCT8i{$Rh8=%SMP`ba zwCqhkIzIpSj|zi9Bn~WJ$@Dz=AfdV^rs*GohlSLQlZW?TK7R-`^ZbMN zV)b}8921nwefH_u>6hn^PhWlT*4cj_oIiRoefNY8ATmmtqy#A{A@T^8*d(?lx=dpP zKT;sXNIJ~f)4xuB|F+1H+6=#>q)e==bc%wRf!A-yv-N-9e*>CQ&qZ3nmKBNTiR=V@ zWNv}^m)BgE4kM|ow7x+bzz<+Zp-YSawF6w{hp9_}oFfdn6~j%i(h|)xmCF^h#>9zA z3qzEZlqP5$g_D8JI1C&w%L~E20f}x&pcuk49Ft~OqVcq% zg0;LIkn?{MJ4jm3Rek7Ocv&5nLUwTrt$o;qhfMHBbK2VjG5YqPJ9fj{^viaIz5gM8 zz6W9yopsZ>>xX!Vc7?rv9X%&S%D;UWzCMD7o8VO$2Tr^4i=C~exxHiQYb|xFwPw`p z`kGna+Fq+0ovrO{%T#r>^GnDW^n-ub4mD%$NB>lYPA~9B{vcfM!Q)r{VBqxZ`JeqW zt7iPee=x|kkqc)9k+YHUx7e|Eh5JCvM^IP6Z1O*LqB^2KNVxfbP)h>@6aWAK2mpsp z;y|2f^P6@7008-u3>qDO%TB^T6b9hEiSN+NUV0(%mbUDC0)2o6Mj@e7!i+|D5G9I$ zc)=J$G$d*y%0(6mp&&2Q)7H1JD2Z|Ca{h15S^P625Ixy?f6-^6X<(WV$L& z^M5wJa2um=gSRS_hvDWvjoe0wH>g}g;Sj2Q9=>jxUa=ek?#TptC9h}0{oJ;h)tXL0%Zz^5>3 zID;aeMpqfcaH0|XQR000QHpc|$I0{kD7pdS^JT_Gw2 zWE}tilOZD(lc6CR0f>{lA(I7A`e%q!lT;#90SJ?+B0vXU1ONbdY%i0cBpi|n1d|XW z3IVW_8zVLX*B+C59vqWzBM=;%Y4e+Q0RRB`0ssIM000000000103ZMW0B0JL5gHbg zWF!z9`su$IstN!A)=&Td4FCWD000000RSKX005Gc+#@;yUkQ^KBsBqslTIW+0uLOM zkR&?+fRoH5Aser^!ZUpY005E;000;O0000000031AOHXWtdj^OD+ZJy00000cyLOe From 37fb4042fa67a534c522836369b507259d9dc7fc Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 21 Apr 2022 16:09:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcHouseDTO.java | 13 +++--- .../epmet/dto/result/HouseListResultDTO.java | 1 + .../service/impl/IcHouseServiceImpl.java | 40 ++++++++++++++++++- 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java index 2bec463b9b..755d3ff086 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java @@ -17,9 +17,10 @@ package com.epmet.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -57,12 +58,12 @@ public class IcHouseDTO implements Serializable { * 所属楼栋id */ private String buildingId; - + private String buildingName; /** * 所属单元id */ private String buildingUnitId; - + private String unitName; /** * 房屋名字后台插入时生成 */ @@ -77,17 +78,17 @@ public class IcHouseDTO implements Serializable { * 房屋类型，这里存储字典value就可以 */ private String houseType; - + private String houseTypeName; /** * 存储字典value */ private String purpose; - + private String purposeName; /** * 1出租；0未出租 */ private Integer rentFlag; - + private String rentName; /** * 房主姓名 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseListResultDTO.java index a63f415e94..c3ae6f07e1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseListResultDTO.java @@ -18,6 +18,7 @@ public class HouseListResultDTO implements Serializable { private static final long serialVersionUID = 2063032844842070847L; private String houseId; private String houseName; + private String rentFlag; private List categoryList; @NoArgsConstructor diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 102dbc168f..c2ca4fba8e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; 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.result.OptionResultDTO; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; @@ -18,11 +19,17 @@ import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.HouseFormDTO; +import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; import com.epmet.entity.IcHouseEntity; +import com.epmet.enums.HousePurposeEnums; +import com.epmet.enums.HouseRentFlagEnums; +import com.epmet.enums.HouseTypeEnums; +import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.OperCustomizeOpenFeignClient; +import com.epmet.redis.IcHouseRedis; import com.epmet.service.IcHouseService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -47,6 +54,10 @@ public class IcHouseServiceImpl extends BaseServiceImpl categories = new ArrayList<>(); if (null != countMap && CollectionUtils.isNotEmpty(categoryList)) { for (IcResiCategoryStatsConfigDTO category : categoryList) {