From 1d70734941ac7a934cb084b79a76fd0f0e7c5c60 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Thu, 24 Mar 2022 17:51:07 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E5=AF=BC=E5=85=A5-=E3=80=8B=E6=88=B7=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcHouseServiceImpl.java      |   2 +-
 ...V0.0.27__resiImportTemplateLabelUpdate.sql |   2 ++
 ...ic_resi_info_import_cid_for_easy_excel.xls | Bin 77824 -> 77824 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql

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 b6d0585694..0835d6604e 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
@@ -141,7 +141,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         return list.stream().map(item -> {
             OptionResultDTO dto = new OptionResultDTO();
             dto.setValue(item.getId());
-            dto.setLabel(item.getHouseName());
+            dto.setLabel(item.getDoorName());
             return dto;
         }).collect(Collectors.toList());
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql
new file mode 100644
index 0000000000..28ae0153da
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql
@@ -0,0 +1,2 @@
+-- 修改所属家庭项label为户号
+update ic_form_item set LABEL='户号' where LABEL='所属家庭';
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls
index 3be61c72adaa78a260aac4f6b24eaf4c5cf50aa7..99376d01a939f088169b23d518de99aa810e6c33 100644
GIT binary patch
delta 1997
zcmZvaYitx%6vxk<nceN~?0dKSpe-$kL6lGk22vWNbU|7cx<H{U1-7(6<qZX?NG&ZO
zqQy$!5H?0WNHl>$1j0nuNMtdh!9)~=1U^t$B=G?TunI`Q;<@{{P&AXdbANO0dHwHc
zO(?Ai<w&KB#j-E`s`!rlJa)-txRd_vl-;;O=f-QY2?y&ucvKmRqZALe(reY_VySL0
z9+&mFhqzmD<0T~*m(c!#?9?{t+&ZkVIB|;AhB1>3@0gs1;ROkBgC8%OyiCP0)&lgZ
z15>BezR7Q^s^=$}5C1TE@kp8mCy8t>8vxvXXb0Hka75Lp3W_mlvzztIiy;e-TWIz&
z58AAJUt{*VvNJyCpthu7s1M)-jx~GneY4(g$=G()*T?hY`JjwU*66}Gc{(%Jb5KxH
zP?Gfg!jeaE4^szr%(oQMK18bzZ&Frsa#eAq>Sb2i55ij(z2B6Hvd7`@s2-}hPcnzf
zYs84zX&8~_%T&LSqWW=_)#J~~_&v&=K1Ut8NQ0CTDXWKf#WhP<^(hUs9_xNZkw<J!
zXa`(_hOl4o+}M6O-Ie4A239>aJpD>&<-8d+3#Tr6a|`r=1lmjU*g70in$L={g7z9N
zqcw<aw6@^>(!65F$K2b<u7u*-KC9>*!3Q0ma%&blUo)mw*ZO#LAC&J5<ggsf4e+p|
zXboaGkT?5kS1RDJS?lYc4A=*n?xd{SmL6aGU#qJ-WgR%{tN*bc#50s7fHwj`@2@~}
zb1T7*gZ@^s$}oTjr;KZ%6F&rV@cKA=bn*a}h4;txHyqNfVgMU(!1(7360nhVcPq8(
z@fW15lDf#8PiB7<(F)7nljIFhh^HqGX9G1BEXlH}V5IO2RC<g?EmV0@lI$}v(r`eF
zSGgH`5j(f9QU3ux4i=aM6L4C%e0~`b|Hr@z<@998M*E3^>_kC94x&kdoJ5laxrizR
zxrsv96TUAUsn))0w@S$>j^n90-<Y1A53qU>K-F?yBgU&LG>r7niRfqpYm)0=3fk)e
zMN>sEUf?uAyg)unsp5Ho(*^MYXJ~KNow6GDz6!8-Bfx!aZo>rS2@&Q(6+YD%Y?&!M
zc@DaobX1;WmLQ&^S`g1MTM!pvjvy|=TtQrfh@fnu8X_j?K>{620EVFsi`Ly(=3=E7
zXbaN1y=^kBoo!vLR6Dcn0b`rB)9p6WM(f<Zl^Oj}fZ9C(54Ghxywp@mu`tX-d3X8z
zT9J!)QzwXbLz+LP*aAVkn}vdSH}!&eH!lg|-7M0^cGO6k_1!krc(4QD&qDw^w7nmm
zmmk%#81L>cwk;8Uyq2Zp_nSq!5=+klb<@I}T&brG0B?N>;P@8c@L3v&Ztd%1zl&iA
z!!jHe53=Rh9G^L3MLMWNGg}QS1=)yJ39=J42yzgu7UU#aBgjScvNq^Mk=OM3MF8DT
z03ZBJHT<nDxbQ-{rDnDk`&}Hy8dI$wy|hV{u3r;<+}z5f%{O{sPFF9~Zui3Ay<T|r
zK?X<nY-Ms2Fzx$xOX|W~m@6Yuw#uN>$>6M?VNJu`SVUo$(jqmpSE9!ZEWp-9AJV6Y
z=017TT%?JxUXYEbNsyiBH9-!d=2%k}Ys}u=m-&>9C(3$axqaDq#c^`YUuwmVtc1?C
Yw!gk_-<a6y{_G7sTNu0d3^N%11yC>#KL7v#

delta 2124
zcmZ{kd2Ccw6o=1!^Jd!F*LGg_kwh!nAQeSfY=;h&mZ1wRbcGq(N@Xcfc4d*;AevSY
zdq}I;D3~TvjHKqNbx9nINYEHmXrzBMr8R~`ODZ7&MG-uArgNn*&SdU;-#yDczjN=M
zmJzvSMD8osWS2;+y|%n08(hFYxAq)h{JHOc=W(wl2Mw~qa_~J(5D&?T=%HVQHW~Zq
zY0;+Q8hJYAX%&1x>%voVDwfF#{w!zVOxdNjYF%2U#|vgRb{ZUb!k|mi(|T8L*#JHS
z@Or!+kY{*CsGfMdVBlU#*wbT7r?_0>Lo{wMx?@Bs;V3=69n+dMVdb%o=!ysJ_AX<W
z5oG;@^_J1ioLDkZo!6veF0@*vVzWt?L={Hr9Dq8nXSxD#A{?dQt0s3+V$^!Du`!ep
z$^iMXu+@zrvL-~W13(JBBG!t(o7^~T4tD}O%?i$>Uyjj%E6nM5%B-*?;n8B$;kZeO
zbkAvyX6&}x6OD<aAsJtzet9f9=iMEhNw)hi(`?6POQOvXjh(0l_ZyOt#3q?08%R?`
zq8`7uL^h1P)SH&0vV3XLp`X-a&Z*PbAP&sCCuOXhVj+&zEUsEITC!oq(%{O)t6q8m
zlHo_R<)yLJI4v)OWnnSB_h1u^bFq!aW;~jgHb?r1N9);WNvQp^;>j5lIP?j(#<TOm
z+&XQ`?b#KW-Qi1NCQSA5w6kfPi&eg~+JP&PgxS?Q8t+V)3{BS}*7mhuY`xnm{}r)j
zR(~DC+KoTZDv#i}&+i@qE5PMJ?hd-kef+TmAOTC~?_pjX^{3$2d>d-=r^LOhZKjL0
z8?*8sG|Ird^?_v{*S;T61NnoJI<Me$NwXU=acJQTrl>Z*H{Oy0d@~rN(AQ*A1LY?r
ziB;kUJ;&5D6)uLGi=JaoVqH~X!vgaA2MpwEfkG${WF;yTWTW?mg6u?oK@Ortf}BJ}
zf?Pz!Xs-TSI#NTc|EWGPmdID%g24lRJiqK4LrMcc!zzFU>v(l|rlMGVCva0@G9Ibh
z%}Ow%-Z!gM<l{9i7Q|~T6U1xe$0(wP*SJJ|v;MTj(D5ul&GP`4UJRG8a#OK}O4y}Y
z4omUjZT>wKB8aE26vWe43F7Ii1@ZJXf_MvR1@RUv6U1AvTu=g0fQU&tkU$FyfMKB5
ztm?NHI9V>1wfSj$tF4H}OKn$Ju6m*U29vhzpVT}xc)-OBhAx1zZaP7S!^W*0>6&oY
zc5131h>p&}h81F2F04)v7gjHb3!_cAt#3~W;=)!6;=&pQabZuZrM*E(O?#uwsPFCt
z_~kf2tJ>Fd{=ZUIp{{q1b+riNrL3W_U(M3l{ySxvn1lD~-Z+3AUjazp0USOTb~^X@
zc;rxUd27)d^0Ov<IaIlH-9%=I4sZ>u7i1;cAjn44EXYo@QILaZlOQM2X7%wCv)qQ`
zLjc!C0S;aam#}#-Cn~D|w&3)kY_>I`|I6W4qcrr}9cnJSXy?XbOq#C5nC!V4V{-2G
z7?T4xCQpWLx|pU3m^%E5S>l(A&WDLPqm9%V8Jux2IGMz7{l-7~*U4-++R6gh*7a>1
z^Rew+mU!ly^^9nPh3-4uoA9ZS=#Oe4>=0xl+9}9Rw5z`@o^4C$sI+#bGe!P1v#`5A
nHJ#<l_PwPSPZynKUUF}_W-g!iX#b`uY@d!*^k2W9#l`&#^}#=j


From 2f3b1a8da80b0a1fd2e8071240280b5880fecdde Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Thu, 24 Mar 2022 17:56:53 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E5=AF=BC=E5=85=A5-=E3=80=8B=E6=88=B7=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ic_resi_info_cid_for_easy_excel.xlsx      | Bin 25170 -> 25168 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx
index bb88725ee669eec8e404a2dbdfaf20943df9e261..3fc8d64c974fc70c80036c4fe6ed0a69445a7f63 100644
GIT binary patch
delta 16807
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
P3M4kBg@M%l`xO5V)u-6H

delta 16828
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
Q`az^7pJ1T%{yxe70jqzIbN~PV


From 397bcaca2fe14be44559d116e1d9833801570cf5 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Thu, 24 Mar 2022 22:29:11 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E6=88=B7=E5=8F=B7-=E3=80=8B=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../V0.0.13__changeHomeColumeName.sql         |   2 ++
 ...V0.0.27__resiImportTemplateLabelUpdate.sql |   2 --
 .../ic_resi_info_cid_for_easy_excel.xlsx      | Bin 25168 -> 25164 bytes
 ...ic_resi_info_import_cid_for_easy_excel.xls | Bin 77824 -> 77824 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql
 delete mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql
new file mode 100644
index 0000000000..b70fd29096
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql
@@ -0,0 +1,2 @@
+-- 修改所属家庭项label为户号
+update ic_form_item set LABEL='房间号' where LABEL='所属家庭';
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql
deleted file mode 100644
index 28ae0153da..0000000000
--- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.27__resiImportTemplateLabelUpdate.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- 修改所属家庭项label为户号
-update ic_form_item set LABEL='户号' where LABEL='所属家庭';
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx
index 3fc8d64c974fc70c80036c4fe6ed0a69445a7f63..5a2c56972a0cd0c6c9dd250bce898be9044926e2 100644
GIT binary patch
delta 9968
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
Xp9|~d?9_jz%tOd6n30|h|0@3v7k>W|

delta 9896
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
CiQ|$0

diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls
index 99376d01a939f088169b23d518de99aa810e6c33..af52e02e95fc8b747617864bd1c6ddb1e129f178 100644
GIT binary patch
delta 1236
zcmZuuYitx%6h3F>&g|~YzPH(#-R(ZWRKOUTih%?}cWt}=u%VSl5lVroX+u)6RDy|y
zglbZyZHkejZK9+E(;o=Y)Qrt454$2_NTd=$@dwh@A8II%(pa%rt#@X(R;8KDxnJgc
z+;h&fj<D7d);}eP?b#$v3uj4TI=#(;lof;2$nkRio@IqpE9tbB;|WoxyZn4W(y^49
zSTT2msX+46cVd|OxwBL%WJx$F7%xZ(2^}=-(x_YUQ&y2f4gi>(@dA7VkV>Qyz?LOO
zpaA?dte7g@QYO?G_a)V0UYk{I9+z&p9CT=2_Q5=BdIPgJzUlMzs68q$N1mNgHPop(
z-(AWnqmMl9CA8BSLodDV)I#omyp4^6@xeH-6_z(dgPe8FvX_8QlF|XP7OT-Mr$$#@
z*2HM1xT}~-RX^3cV(8*rg6=py7T>DMsF>>9mI4K{i3feYpc>@8hUpEymxNmm+`GBu
zoQtA|=Z9#gJLnD0y7T?eekDwNEPB=LQ8=0F&Ou+hbN_==#$WCujJ4DXWyaCKlBIZ?
zE<L&+!q)R7uwm_*jq69No9k<~HLTgbuMNU*jl5-1e1(>l#W77)9G{|Rd99%iUfbzN
zS@e;}fa!MNX!T&{@v8qO=wN(ovUa?@E%}tx`tNid)*UF1U=bCTo3Sf-t)Y$O(akp|
za)BkAUTXY*U>Mqd%dwqJpYFbwjo!_%i#B~R4?92?_${mHW_hJH4jzE<Urag3<5}~l
z1JLM+ioN(4jaEiztU{-e3OkAEh1gH`r%P-iVDjl--!kgbdnH^!R~}!6C5E>$Wp~>_
z<^c$H{>ZYib=?_32tP?5_8m2bHmnqd<Fy?BZmb&n7U^=`IpyJJ0QPJLsNZ2~XlO%~
z@$S~o{K~Nx0d~C%AnmjC4bNZK_~O@gRPx%}v6|QG9TS)~hC8QG=-O|J2F_!*K!^J5
z%6&ZmO$YhEIBc1BA9%>`7<doh&kq3JG5Y)3{lZu#Z|M~j`Wztg6~HGKE&0V0y%FWh
zD*&D!0p9<~`nK!)3qE1;nuS-5^$J4Q%{g2&F^5l0&f%J=IecR}kNMon%sH_Q(74*w
zB?h+ebrsnF;wr+=euN)FNYAz0$?Ra*9_o&v&Kd%z&twW?m}XwqBUD#?gDLKTKc@B!
RWm*>EYce)xrWT{k_BRF#k8l70

delta 1168
zcmZuvZD?C%6h800?@i3T`MilYH%Z&nft?j;oI(fg$7<4o5=>U7uB#<=%1Vb5-9-Et
znsim>I_JlZE`Rz%QCYV^S9sBgUoE(a6NTXhis*XlKqZsfRaa~+i|5{S!!Is5C+9rp
zdCqw*w`B2>#U~ae`NUKYE=!-{yd1$6C5|N?$0hnLa~+$wiL<f`w{rtk9>KG`0l$?E
z>`)AB=MC=l@Sy|%xR<x0u0(L0@Lt8lJBjx>4~pGNM8TX-$2p&iX?RSH;)1HXZ*I0A
z0x_Icqtu=D*)gD{oXHJZlaouD%bsN>ULe-QN_B%%5f%>6-ix&$z^kE9Su1P6Jq{N1
zx>ywRj%LamWd;WPwtl}i#Ul8UHyZO@VGayTCMT1?*E;uvagtE|GI|D@JDNL8fGGzJ
zVbRx&6*a(unDnJcF;CINUulQe!5-HF%ujWz?KY-f))@_j49%eX;*JhE^+&Pb)!pqY
zwe8<SnlXIDZ{WNBfO=)AhGZd3ChJz~CmD2-W7YE8FO??5CI1-ba{I6)j)Ys=*iU%o
z)@u?=8;J*Q*4y24*G&H5`|j@F+CBLEa}Wm$gXu>01h%D<Y#rw4zrgJjvp7Prh-2x-
zb)k1`wujB+C-=Rd`=^2lhu^c&tJv55>$fPSzpI;Y`+-b?C9ol5%icmUi#?gfd(X|+
z1=nnTYT)03aoDv`NB2GW@nio*!%KB^_2v`*gC50Gv?YVHnQZiDpbultvd6(S=UmwX
zVBm(%B25ex5_rDTM6GKT8^^Y;HHrjm?fqh)tEjkA82~R}vf84`#J<)Iu(})b)tuOt
zz2Nq1;Gr%9jUJCj3~oFwNx@BoAHhN)Ct5cBB1sdyB47Pd!kNC4>h%u*>>LER=OKGW
z6bgZ``o@z0+lB!C+(W%3v14a7%F@_3lBGB{atFnQk$ELedpNSUZWN6#e8%MA7eQFH
z{j%P-a#gGhuw@jW_ByHjA&LiX($%Af0e%|?cttop@%GChd8T3$Uz63np8$lu062Eq
zSv&o~XhQwyI{@VefH!}12v2`=D#Xr<T(vAq!?Pk^Jt#|w`Fa)?>p8nv&*zpYlgmi$
zB-<s<*2=QyYK_77I)l@dXJocJj#j67u!)&`XzI30m4+tP#e>Hm{awp_#X87DY5%i_
T4pnxnVtZU{Yi02|=63%DTSIa-


From e505c9d5ee73ffea1e625f97abb238395128301b Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Fri, 25 Mar 2022 09:30:04 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/migration/V0.0.13__changeHomeColumeName.sql    | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql
deleted file mode 100644
index b70fd29096..0000000000
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__changeHomeColumeName.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- 修改所属家庭项label为户号
-update ic_form_item set LABEL='房间号' where LABEL='所属家庭';
\ No newline at end of file

From 6ced9dbd0ea3e333d7ed1553b685687048f6f577 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 25 Mar 2022 09:57:58 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E6=80=A7?=
 =?UTF-8?q?=E5=88=AB=E3=80=81=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E3=80=81?=
 =?UTF-8?q?=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F=E7=9A=84=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4=E4=B8=BA=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=AF=81=E5=8F=B7=E3=80=81=E6=80=A7=E5=88=AB=E3=80=81=E5=87=BA?=
 =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.17__update_sort_idcard.sql     | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__update_sort_idcard.sql

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__update_sort_idcard.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__update_sort_idcard.sql
new file mode 100644
index 0000000000..9d383f58d9
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__update_sort_idcard.sql
@@ -0,0 +1,12 @@
+UPDATE ic_form_list_item 
+SET SORT = '5' 
+WHERE
+	FORM_ITEM_ID IN ( SELECT i.id FROM ic_form_item i WHERE i.LABEL LIKE '%身份证%' AND i.DEL_FLAG = '0' ) 
+	AND DEL_FLAG = '0';
+	
+UPDATE ic_form_list_item 
+SET SORT = '6' 
+WHERE
+	FORM_ITEM_ID IN ( SELECT i.id FROM ic_form_item i WHERE i.LABEL LIKE '%性别%' AND i.DEL_FLAG = '0' ) 
+	AND DEL_FLAG = '0';
+	
\ No newline at end of file

From 5bb10bda1b0bd54b0099660727b38c47164376ea Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 25 Mar 2022 09:59:28 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E6=88=BF=E4=B8=BB=E5=BF=85=E5=A1=AB=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/migration/V0.0.13__ic_house_remove_owner.sql | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__ic_house_remove_owner.sql

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__ic_house_remove_owner.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__ic_house_remove_owner.sql
new file mode 100644
index 0000000000..edf66e716e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__ic_house_remove_owner.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `epmet_gov_org`.`ic_house`
+    MODIFY COLUMN `OWNER_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '房主姓名' AFTER `RENT_FLAG`,
+    MODIFY COLUMN `OWNER_PHONE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '房主电话' AFTER `OWNER_NAME`,
+    MODIFY COLUMN `OWNER_ID_CARD` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '房主身份证号' AFTER `OWNER_PHONE`;

From bd74456861ddbdad57f49a0546d71722ba5ccc24 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 25 Mar 2022 10:04:00 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8E=BB=E6=8E=89=E6=88=BF=E4=B8=BB=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/IcHouseFormDTO.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java
index 58376e2032..fb679755d7 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java
@@ -87,19 +87,16 @@ public class IcHouseFormDTO implements Serializable {
     /**
      * 房主姓名
      */
-    @NotBlank(message = "房主姓名不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String ownerName;
 
     /**
      * 房主电话
      */
-    @NotBlank(message = "房主电话不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String ownerPhone;
 
     /**
      * 房主身份证号
      */
-    @NotBlank(message = "房主身份证号不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String ownerIdCard;
 
-}
\ No newline at end of file
+}

From 9bc9b52705001f84a00fa117ad7d34d19498f534 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Fri, 25 Mar 2022 10:13:58 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=A1=A8=E5=A4=B4=20=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E6=88=BF=E5=B1=8B=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcFormItemServiceImpl.java    | 9 +++++++++
 .../db/migration/V0.0.17__updateSuoShuJiaTing.sql        | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__updateSuoShuJiaTing.sql

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
index 3afb6df67e..e7afee12c9 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
@@ -71,6 +71,15 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
         //list.add(new TableHeaderResultDTO("所在家庭","HOME_NAME","input"));
         //改为查询ic_form_list_item
         List<TableHeaderResultDTO> result=baseDao.queryTableHeaderList(formDto.getCustomerId(),formDto.getFormCode());
+
+        for (TableHeaderResultDTO column : result) {
+            if ("HOME_ID".equals(column.getColumnName())) {
+                // web界面table
+                column.setLabel("所属房屋");
+                break;
+            }
+        }
+
         if(!CollectionUtils.isEmpty(result)){
             list.addAll(result);
         }
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__updateSuoShuJiaTing.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__updateSuoShuJiaTing.sql
new file mode 100644
index 0000000000..9b4cfd165c
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__updateSuoShuJiaTing.sql
@@ -0,0 +1 @@
+update ic_form_item set LABEL='房间号' where LABEL='所属家庭';
\ No newline at end of file

From 329a1b422c9ccb20195c85fa00ebb0fef361fd94 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Fri, 25 Mar 2022 10:18:03 +0800
Subject: [PATCH 09/18] =?UTF-8?q?flyway=E7=BC=96=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...__updateSuoShuJiaTing.sql => V0.0.18__updateSuoShuJiaTing.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/{V0.0.17__updateSuoShuJiaTing.sql => V0.0.18__updateSuoShuJiaTing.sql} (100%)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__updateSuoShuJiaTing.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.18__updateSuoShuJiaTing.sql
similarity index 100%
rename from epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__updateSuoShuJiaTing.sql
rename to epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.18__updateSuoShuJiaTing.sql

From 38c55669a2a4e6947e95cea3dc09475cc0388ee1 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 25 Mar 2022 10:21:42 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8E=BB=E6=8E=89=E6=88=BF=E4=B8=BB=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E7=89=88=E6=9C=AC=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ..._house_remove_owner.sql => V0.0.14__ic_house_remove_owner.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/{V0.0.13__ic_house_remove_owner.sql => V0.0.14__ic_house_remove_owner.sql} (100%)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__ic_house_remove_owner.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.14__ic_house_remove_owner.sql
similarity index 100%
rename from epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__ic_house_remove_owner.sql
rename to epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.14__ic_house_remove_owner.sql

From 1c75cc55eafd2666eced02c7a9303f23a8b7c889 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 25 Mar 2022 10:30:48 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4=E4=B8=BA?=
 =?UTF-8?q?=EF=BC=9A=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E3=80=81=E6=80=A7?=
 =?UTF-8?q?=E5=88=AB=E3=80=81=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.19__update_addform_idcard_sort.sql        | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__update_addform_idcard_sort.sql

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__update_addform_idcard_sort.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__update_addform_idcard_sort.sql
new file mode 100644
index 0000000000..5305539887
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__update_addform_idcard_sort.sql
@@ -0,0 +1,2 @@
+update ic_form_item set SORT='8',UPDATED_TIME=NOW()  where LABEL='身份证号' and DEL_FLAG='0';
+update ic_form_item set SORT='9' ,UPDATED_TIME=NOW()  where LABEL='性别' and DEL_FLAG='0';
\ No newline at end of file

From 6778b9da7b1b9817d968863db141819fa18a5fae Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 25 Mar 2022 11:17:23 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/datareport/controller/screen/IndexController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
index 1e4a67a0b9..4a566e9226 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
@@ -156,7 +156,7 @@ public class IndexController {
 
     /**
      * @param formDTO
-     * @Description 数字社区：数据分析-动力网格
+     * @Description 数字社区：数据分析-动力网格 数据由市北服务端自己添加的
      * @author sun
      */
     @PostMapping("advancedbranchrank-shibei")

From ed2033d26d7c24fbad0cefaed6d4316c1fc7f468 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 25 Mar 2022 13:59:33 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=AD=98=E5=9C=A8=E7=9A=84=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/ImportGeneralDTO.java  |  2 +
 .../dto/result/ExistHouseInfoResultDTO.java   | 19 ++++++
 .../java/com/epmet/dao/IcBuildingDao.java     |  3 +-
 .../main/java/com/epmet/dao/IcHouseDao.java   | 26 +++-----
 .../epmet/model/ImportHouseInfoListener.java  | 62 +++++++++++--------
 .../com/epmet/service/IcHouseService.java     | 26 +++-----
 .../service/impl/IcHouseServiceImpl.java      | 30 ++++-----
 .../main/resources/mapper/IcBuildingDao.xml   |  7 ++-
 .../src/main/resources/mapper/IcHouseDao.xml  | 44 +++++++++++++
 9 files changed, 140 insertions(+), 79 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExistHouseInfoResultDTO.java

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 9039cda6ef..fb2490aff2 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
@@ -138,6 +138,8 @@ public class ImportGeneralDTO implements Serializable {
 
     private Boolean existStatus = false;
 
+    private Boolean addStatus = false;
+
     /**
      * 楼栋重复状态
      */
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExistHouseInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExistHouseInfoResultDTO.java
new file mode 100644
index 0000000000..561925a7c1
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExistHouseInfoResultDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/25 10:46
+ * @DESC
+ */
+@Data
+public class ExistHouseInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6350975846409029631L;
+
+    private String name;
+    private String houseId;
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
index 87ee60fcd4..787bf47679 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
@@ -22,6 +22,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.result.BaseInfoFamilyBuildingResultDTO;
 import com.epmet.dto.result.BuildingResultDTO;
+import com.epmet.dto.result.ExistHouseInfoResultDTO;
 import com.epmet.dto.result.UpdateBuildingHouseNumResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.IcBuildingEntity;
@@ -161,7 +162,7 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
      * @author zxc
      * @date 2022/2/14 5:32 下午
      */
-    List<String> selectExistHouse(@Param("ids")List<String> ids);
+    List<ExistHouseInfoResultDTO> selectExistHouse(@Param("ids")List<String> ids);
 
     /**
      * Desc: 查询客户下户数为空的
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
index 28c0014f19..f4b4a2c402 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
@@ -1,24 +1,8 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.NeighborHoodManageDelResultDTO;
 import com.epmet.entity.IcHouseEntity;
@@ -100,4 +84,12 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      */
     List<String> selectHouseNames(@Param("ids")List<String> ids);
 
+    /**
+     * Desc: 批量更新房屋信息
+     * @param houses
+     * @author zxc
+     * @date 2022/3/25 10:22
+     */
+    void houseUpdate(@Param("houses") List<ImportGeneralDTO> houses);
+
 }
\ No newline at end of file
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 60b609752c..b837534082 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
@@ -15,6 +15,7 @@ import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.result.ExistHouseInfoResultDTO;
 import com.epmet.dto.result.ImportResultDTO;
 import com.epmet.dto.result.UpdateBuildingHouseNumResultDTO;
 import com.epmet.entity.IcHouseEntity;
@@ -48,6 +49,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
 
     List<ImportGeneralDTO> needDisposeList = new ArrayList<>();
     List<ImportGeneralDTO> needInsertList = new ArrayList<>();
+    List<ImportGeneralDTO> needUpdateList = new ArrayList<>();
 
     String gridName = null;
     String agencyName = null;
@@ -125,21 +127,6 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             disposeErrorMsg(info, "是否出租的值未填写");
             return;
         }
-        if(StringUtils.isBlank(data.getOwnerIdCard())){
-            nums.add(num);
-            disposeErrorMsg(info, "房主身份证的值未填写");
-            return;
-        }
-        if(StringUtils.isBlank(data.getOwnerName())){
-            nums.add(num);
-            disposeErrorMsg(info, "房主姓名的值未填写");
-            return;
-        }
-        if(StringUtils.isBlank(data.getOwnerPhone())){
-            nums.add(num);
-            disposeErrorMsg(info, "房主电话的值未填写");
-            return;
-        }
         if(StringUtils.isBlank(data.getDoorName())){
             nums.add(num);
             disposeErrorMsg(info, "门牌号的值未填写");
@@ -208,29 +195,46 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         if (CollectionUtils.isEmpty(needInsertList)){
             return;
         }
+        // 根据单元ID_doorName查询已存在的
+        List<String> ids = needInsertList.stream().filter(n -> StringUtils.isNotBlank(n.getBuildingUnitId())).map(m -> m.getBuildingUnitId() + "_" + m.getDoorName()).distinct().collect(Collectors.toList());
+        List<ExistHouseInfoResultDTO> existHouses = icBuildingDao.selectExistHouse(ids);
         Map<String, Long> collect = needInsertList.stream().collect(Collectors.groupingBy(n -> n.getBuildingUnitId() + "_" + n.getDoorName(), Collectors.counting()));
         collect.forEach((k,v) -> {
-            if (Integer.valueOf(v.toString()).compareTo(1) > 0){
+            if (Integer.valueOf(v.toString()).compareTo(1) != 0){
                 for (ImportGeneralDTO r : needInsertList) {
                     if (k.equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
                         // 集合里重复的
-                        nums.add(r.getNum());
+                        /*nums.add(r.getNum());
                         disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
-                        r.setExistStatus(true);
+                        r.setExistStatus(true);*/
+                        if (!r.getAddStatus()){
+                            for (ExistHouseInfoResultDTO existHouse : existHouses) {
+                                if (existHouse.getName().equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
+                                    r.setHouseId(existHouse.getHouseId());
+                                    break;
+                                }
+                            }
+                            needUpdateList.add(r);
+                            r.setAddStatus(true);
+                            r.setExistStatus(true);
+                        }
                     }
                 }
             }
         });
-        // 根据单元ID_doorName查询已存在的
-        List<String> ids = needInsertList.stream().filter(n -> StringUtils.isNotBlank(n.getBuildingUnitId())).map(m -> m.getBuildingUnitId() + "_" + m.getDoorName()).distinct().collect(Collectors.toList());
-        List<String> existHouses = icBuildingDao.selectExistHouse(ids);
         existHouses.forEach(e -> {
             for (ImportGeneralDTO n : needInsertList) {
-                if ((n.getBuildingUnitId()+"_"+n.getDoorName()).equals(e)){
+                if ((n.getBuildingUnitId()+"_"+n.getDoorName()).equals(e.getName())){
                     // 库里存在的
-                    nums.add(n.getNum());
-                    disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
-                    n.setExistStatus(true);
+//                    nums.add(n.getNum());
+//                    disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+//                    n.setExistStatus(true);
+                    if (!n.getAddStatus()){
+                        n.setHouseId(e.getHouseId());
+                        needUpdateList.add(n);
+                        n.setAddStatus(true);
+                        n.setExistStatus(true);
+                    }
                 }
             }
         });
@@ -238,6 +242,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         Map<Boolean, List<ImportGeneralDTO>> groupByExistStatus = needInsertList.stream().collect(Collectors.groupingBy(ImportGeneralDTO::getExistStatus));
         List<ImportGeneralDTO> importGeneralDTOS = groupByExistStatus.get(false);
         houseInsert(importGeneralDTOS);
+        houseUpdate(needUpdateList);
         // 清除
         needDisposeList = new ArrayList<>();
         needInsertList = new ArrayList<>();
@@ -576,4 +581,11 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void houseUpdate(List<ImportGeneralDTO> houses){
+        if (!CollectionUtils.isEmpty(houses)){
+            icHouseService.houseUpdate(houses);
+        }
+    }
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
index 66f02d80fa..e2110550bf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
@@ -1,20 +1,3 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
@@ -22,6 +5,7 @@ import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcHouseDTO;
+import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.entity.IcHouseEntity;
@@ -124,4 +108,12 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      */
     List<HouseListResultDTO> getHouseList(TokenDto tokenDto, HouseFormDTO formDTO);
 
+    /**
+     * Desc: 批量更新房屋信息
+     * @param houses
+     * @author zxc
+     * @date 2022/3/25 10:22
+     */
+    void houseUpdate(List<ImportGeneralDTO> houses);
+
 }
\ No newline at end of file
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 0835d6604e..0e32dbef1e 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
@@ -1,20 +1,3 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -33,6 +16,7 @@ import com.epmet.dao.IcHouseDao;
 import com.epmet.dto.IcHouseDTO;
 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.HouseListResultDTO;
 import com.epmet.entity.IcHouseEntity;
@@ -235,4 +219,16 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         }).collect(Collectors.toList());
     }
 
+    /**
+     * Desc: 批量更新房屋信息
+     * @param houses
+     * @author zxc
+     * @date 2022/3/25 10:22
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void houseUpdate(List<ImportGeneralDTO> houses) {
+        baseDao.houseUpdate(houses);
+    }
+
 }
\ No newline at end of file
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 c2482d86af..190f93904a 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
@@ -335,8 +335,11 @@
     </select>
 
     <!-- 查询已存在的房屋 -->
-    <select id="selectExistHouse" resultType="java.lang.String">
-        SELECT CONCAT(BUILDING_UNIT_ID,'_',DOOR_NAME) FROM ic_house
+    <select id="selectExistHouse" resultType="com.epmet.dto.result.ExistHouseInfoResultDTO">
+        SELECT
+               CONCAT(BUILDING_UNIT_ID,'_',DOOR_NAME) AS name,
+               ID AS houseId
+        FROM ic_house
         WHERE DEL_FLAG = '0'
           AND CONCAT(BUILDING_UNIT_ID,'_',DOOR_NAME) IN
             (
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 4a53158d3e..b8f3bfef66 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
@@ -26,6 +26,50 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 批量更新房屋信息 -->
+    <update id="houseUpdate">
+        UPDATE ic_house
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="HOUSE_TYPE =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.houseType}
+                </foreach>
+            </trim>
+            <trim prefix="PURPOSE =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.purpose}
+                </foreach>
+            </trim>
+            <trim prefix="RENT_FLAG =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.rentFlag}
+                </foreach>
+            </trim>
+            <trim prefix="OWNER_NAME =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.ownerName}
+                </foreach>
+            </trim>
+            <trim prefix="OWNER_PHONE =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.ownerPhone}
+                </foreach>
+            </trim>
+            <trim prefix="OWNER_ID_CARD =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.ownerIdCard}
+                </foreach>
+            </trim>
+            UPDATED_TIME = NOW()
+        </trim>
+        WHERE DEL_FLAG = '0'
+        AND ID IN (
+              <foreach collection="houses" item="h" separator=",">
+                #{h.houseId}
+            </foreach>
+            )
+    </update>
+
     <!--<select id="searchHouseByPage" resultType="map">
             select
             a.ID as houseId,

From e7971fbbbca643e96e04e86a67204812fc2bcc0c Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 25 Mar 2022 14:42:10 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/template/Controller.java.vm          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm
index b0aaad89eb..1e489dca52 100644
--- a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm
+++ b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm
@@ -71,6 +71,12 @@ public class ${className}Controller {
         return new Result();
     }
 
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<${className}DTO> list = ${classname}Service.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ${className}Excel.class);
+    }
+
 
 
 }

From 6979f590e7ea206da613dcc8083aba1024ed2d8b Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Fri, 25 Mar 2022 14:43:29 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E6=94=B9=E9=94=99=E4=BA=86=E5=95=8A?=
 =?UTF-8?q?=E5=95=8A=E5=95=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../V0.0.19__updateSuoShuJiaTing.sql          |   1 +
 .../ic_resi_info_cid_for_easy_excel.xlsx      | Bin 25164 -> 25172 bytes
 ...ic_resi_info_import_cid_for_easy_excel.xls | Bin 77824 -> 77824 bytes
 3 files changed, 1 insertion(+)
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__updateSuoShuJiaTing.sql

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__updateSuoShuJiaTing.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__updateSuoShuJiaTing.sql
new file mode 100644
index 0000000000..d60b78b385
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__updateSuoShuJiaTing.sql
@@ -0,0 +1 @@
+update ic_form_item set LABEL='门牌号' where LABEL='房间号';
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx
index 5a2c56972a0cd0c6c9dd250bce898be9044926e2..c72b970c0358d24c31b3002f84c26fb4cc9312c1 100644
GIT binary patch
delta 9295
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

delta 9259
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
S3FmnKA;_8(?a}1#*Zmh-Ws&Ou

diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls
index af52e02e95fc8b747617864bd1c6ddb1e129f178..23c9c692aff59a550e8b439ffad6cc639bb3929b 100644
GIT binary patch
delta 1126
zcmZvZZD><h7{{M;@41b=H#cw1dT-L!M8#H_wmQMFIY?~UI_#QQ)U|4xR>n#<6}OHd
zbIis~MWWTMk1;TXZKzQFpyE+8>RfeOhYm&2f<wfn!d{4?wWH1!M?5!ahi?6F{?EDR
z_xzt1ZX`(~NqT%l5PQ$n;}hW~7E5l7P&eKb8!$)<@ea*LzvQMq_)fqoX%>D-b#zEh
zoX_FA{C<L;QGR}*HukCHl!$`;s)k2p-K7A)aM}iN62R~Edx6gLCcz0V?3bH(o=+*`
zx?a&H$ka2L3Vt;qoi#=cuXVi39=koR#1){qV>GR3#DO6`O{rNY8d@zHhRwRmIqv9#
z)qd|B9pGHXk%zm@nk#>t?rCZ1@$`6rzMP?U?BVo<aoPubBmci%8$K|X;m@j$^VQdh
zg@0*8<vJ51N)9n&yXwV1R4dW(Z`Ihk#8O6b(WAQXJxe~GwpcM{nc|Y4ug*uwPNuLc
zmK&6sniqe~j^xcOB_r6ka7uxB8P5k3Sy@}ZY#_A0d3n>@wXNH?f*Xd=R$fG+SX%BO
zH5lagUR=wy5u;qcz^?M51=CI$?p!hu>e<m9e7=GXXTCM)Byyw4w_1ukTV01$oq+-}
z8w&$Q*;lzXVtt@!)$mZZ;M^4(TmD<n4IPiNbjO<SKm0$PKANQ^D|#oOXYnfUvK;RR
zs<p?!|M=jbkq$Y77mUyhpyQH?cCrXJhYRp-g%^_*lTfLwqkqQUXk#sv?NW{}0AL36
zq>5#cd#0NJUa7@UD#+fcerU1)Q2t8z5r9(Gy7VVOm|DmA5e$cethnx;ApEeBg;JLV
z9B8;GzxEcumR5k)bw&;ghpl-s`v~CU%>e3l{x-_qZ%b*U3LB!;T)Uz*TpvY;q$=Kn
zA~`sR745u0#Mmxi$#jS4Xc(L7#W=tR`vL6V@G6g4d*@3I`Rri;=@`HPmU&}`KDUd1
zB@AOsl=uAzFzph+`Rkds{b%+U$X9LwXm<ck{hl#=^6OPQ`G*BlaZ!lfXQ9+yQJ6iH
zjlIL!*f^4n!%ukRTRPJhNe8=~j*Gb^3V{a>0>33TiDaXD?_{FWwRWE?Q8<}YQhP<W
etuuIy`1u0RJ@2zO{fV}zWLpl|kQkXkOs1#gMPon!

delta 1098
zcmZvbeQZ-z7{=fC-qVlUkK47y-P?AfMYBxQY%Y+HjKtP%^$!<17TAD+Y@jSe)KQ5h
zkcAbKp=>FlFRmn#_?L-5AS8#SI)qI=Vl*m57a>NakSNNs&p79BFwbpQ<HvH7=bV$@
z`#kS^PI8l3mdvu#Gm?B@Fif-3cVuR*q?$_Td8X4NCY>f_oo<PJ)TCRUfI|oXlwjpF
zC>PUt*-W#{L*L4NI>P+)In!AfK9=~arjQ90y5ZF5luh?3!ZbBk1aJl*5{iU?EemB~
z5qRi^twq#@?Uh2??b-sBdahET_ZFm&%~QkcEp$2TcBk!WJ1}LQ&e=88sa{M|;n2}d
zE>)w=4&C=a!7&6|BB951fWe%jh~9K)KD9s(x3vuf2ZF#><fxAZ1a%bX5QrN^{`P7#
z=BPv~1)VL_>(uE-r$W<?C6u(A(I%Lde-~Ut(@x{o<!U9mM7580s>N7Lud9``Uv=4v
z3&SY<ih7N)M6(p-$GuA{aDs-OToPbw#Q<Qz=7#laZ`QZBHnwbQ*#1Tr_~8x}MN9ED
zs)z<LMscw}M=uC%q;8=H=!0nK%0QptR`6#1Ku>@C-w8VK4-IO?Yc1g|rsO}<by)Lu
zO#sWNq{fJ?7TQSbYf3kcOy&ctHtcEpZ=fH#e$UgM9p_*9KP|nRr{x<iFF^a~s_3$c
zMr-P{ac}{Q|6-Jbd3?}VHUVg~y0#OaqKVo74cCUq8(YW1TYr0pzZB~<;R+gkdYM$!
zK%I#=Pt;9VR4bT;5y2`xvzhN)b4il?>jXc}vrW~q)Zfg<QeR5+>!#0a%bx}4*bdP8
zqQNQK6z69)f8tS2>;~Ai55UCtCVtYzJ3rT5C-ijpDxvqgCo#q+dS($*d^DAom50&*
zJC2GM=Lg?<)NAWI25|2bz`I<e{=v__f5<HjXGGV7vga8wTbV`tWfuVgUjTgcji|ZH
zZ=XFHuzmVHfa?~($)9t+uIpFb($pP3Hqt8_okr5KR5qDAO6R8XYvW8FkMQ_xT9&&2
z`FJWNdkbxXc7)p=gdcoJ$;5P~li@xeWoxayi&1CWycaHIN)}^`xmjAOkAIC3F&_Lm
V)A3a}^YVkZ-;C{<nTOG0`3sVFToV8Q


From e9a251720613550ffb174242de61b9603819264c Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Fri, 25 Mar 2022 14:46:13 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E6=94=B9=E9=94=99=E4=BA=86=E5=95=8A?=
 =?UTF-8?q?=E5=95=8A=E5=95=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...__updateSuoShuJiaTing.sql => V0.0.20__updateSuoShuJiaTing.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/{V0.0.19__updateSuoShuJiaTing.sql => V0.0.20__updateSuoShuJiaTing.sql} (100%)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__updateSuoShuJiaTing.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.20__updateSuoShuJiaTing.sql
similarity index 100%
rename from epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__updateSuoShuJiaTing.sql
rename to epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.20__updateSuoShuJiaTing.sql

From 020df4166f44c36d9086639a9760351d6dab5a03 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 25 Mar 2022 14:59:05 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=88=BF=E5=B1=8B?=
 =?UTF-8?q?=E5=BF=85=E9=A1=BB=E5=A1=AB=E5=86=99=E7=9A=84=20=E6=88=BF?=
 =?UTF-8?q?=E4=B8=BB=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/constant/ImportErrorMsgConstants.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
index 6dce569719..be68d37843 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
@@ -9,7 +9,7 @@ public interface ImportErrorMsgConstants {
 
     String EXIST_ERROR = "数据已存在";
 
-    String HOUSE_ERROR = "所属组织、所属网格、所属小区、所属楼栋、单元号、房屋类型、房屋用途、出租、房主姓名、房主电话、房主身份证的值未填写，或者所填写信息在系统中未找到";
+    String HOUSE_ERROR = "所属组织、所属网格、所属小区、所属楼栋、单元号、房屋类型、房屋用途、出租的值未填写，或者所填写信息在系统中未找到";
 
     String BUILDING_ERROR = "所属组织、所属网格、所属小区、楼栋类型、单元数的值未填写，或者所填写信息在系统中未找到";
 

From e7dbb236b8134077ce38178f72d1c23a02afcc92 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 25 Mar 2022 15:15:45 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=88=B7=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/model/ImportHouseInfoListener.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 b837534082..f69987a7b6 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
@@ -531,13 +531,16 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
     public void doAfterAllAnalysed(AnalysisContext context) {
         finalDispose();
         // 更新ic_building户数
-        List<String> list = icBuildingDao.selectHouseTotalIsNull(formDTO.getCustomerId());
+        /**
+         * 2022-03-25 又根据要求，注释更新ic_building户数
+         */
+        /*List<String> list = icBuildingDao.selectHouseTotalIsNull(formDTO.getCustomerId());
         if (!CollectionUtils.isEmpty(list)){
             List<UpdateBuildingHouseNumResultDTO> houseNum = icBuildingDao.selectHouseNum(list);
             if (!CollectionUtils.isEmpty(houseNum)){
                 icBuildingDao.allUpdateHouseNum(houseNum);
             }
-        }
+        }*/
         // 删除缓存
         icHouseRedis.delTemporaryCacheGrids(formDTO.getCustomerId(), formDTO.getUserId());
         icHouseRedis.delTemporaryCacheNeighBorHood(formDTO.getCustomerId(), formDTO.getUserId());