From b7d29074c022309aad1c83a0b1349dc6d4d8d56d Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 9 Sep 2020 17:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E9=87=87?= =?UTF-8?q?=E9=9B=86-=E6=95=B0=E6=8D=AE=E6=B5=8F=E8=A7=88bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HousingInformationController.java | 15 ++++++++------- .../excel/BaseResidentInformationExcel.java | 2 +- .../excel/居民信息录入模板.xls | Bin 43008 -> 43520 bytes .../mapper/HousingInformationDao.xml | 2 +- .../mapper/PopulationInformationDao.xml | 11 +++++++++-- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java index 9f51415d..02fd87af 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java @@ -171,13 +171,14 @@ public class HousingInformationController { } //没有户主信息的房屋，转换excel时，替换是否时会出现null，此时将对应null值替换成空字符 basePopulationInformationExcelList.forEach(basePopulationInformationExportDto ->{ - basePopulationInformationExportDto.setResidentsSex(""); - basePopulationInformationExportDto.setMilitaryService(""); - basePopulationInformationExportDto.setReemploymentPermit(""); - basePopulationInformationExportDto.setUnemploymentRegister(""); - basePopulationInformationExportDto.setDogStatus(""); - - }); + if(StringUtils.isBlank(basePopulationInformationExportDto.getId())){ + basePopulationInformationExportDto.setResidentsSex(""); + basePopulationInformationExportDto.setMilitaryService(""); + basePopulationInformationExportDto.setReemploymentPermit(""); + basePopulationInformationExportDto.setUnemploymentRegister(""); + basePopulationInformationExportDto.setDogStatus(""); + } + }); //根据获取的户主ID查询居住人信息 List basePopulationInformationExcelListWithHouseHead = new ArrayList<>(); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/BaseResidentInformationExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/BaseResidentInformationExcel.java index 4a707513..8ec366b8 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/BaseResidentInformationExcel.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/BaseResidentInformationExcel.java @@ -32,7 +32,7 @@ public class BaseResidentInformationExcel { @Excel(name = "户主身份证号码") private String residentsIdentityNo; - @Excel(name = "与户主关系",replace = {"子女_0","夫妻_1","其他_2","父母_3"}) + @Excel(name = "与户主关系",replace = {"子女_0","夫妻_1","父母_2","其他_3"}) private String houseHeadRelation; @Excel(name = "居住人姓名") diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/excel/居民信息录入模板.xls b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/excel/居民信息录入模板.xls index 3121b6a25ca0a9b956e28b61a887d3bbc0f79861..0063f2f83b964b7ffa4587effac93fbb1b0bc563 100644 GIT binary patch delta 5215 zcmai23vd(H6}@luv1DUeKU=me+p;j&226y1V1AZm;SUDe*pNbi@U{8W5Qbok(O0MC-1Cp|MF_x2||g<2=P1=(a+xV68BERm*ZRo|06WVORDA&aaXo5?2MdV5K~ z9L~^ku%%D}$K4gQ0?T0;xM3_Q$I{13E8wNi3Mhveu(X|0+yiSRQW<=m(=u|p0d^^M z4@9@r%D3}wu20`*alSNTzC_8uP?jSvgS;My6!ob{A6jF?`bJV~ zQN(&9sddu-?Kvl6^_i268};2{KF2co^i8us} zn)7IdybI21)M*7{j^zis!olw31TM8|f)o|D>NP z50I;N(4}zDDFfqOn@isc>1Q5nMw`9F5G^=-#qPjI?N+toMYWAQo=(M5#VDp?sbUN`lFsYWJXMUlQ?XPrUQWeQ#c0b-I$~v&D#pdBSgIHgr(&sM zyqSunim@~=#k^E8_N8K}Vmy%-SL>sB59v}bgq$J z6Vc3^Jb6;dR&+7BE?QUN$BQd0!mnrJo=TT+tQCJ$xp~2}(91`UTmnC4-B~Xo{hbzS znM-~f^FVlU@WW)hBE} z8YOR0W(*r>wxKv|1gaK$%$^>EbXA8LJg_)ICS<}jQ_R5xCKW#mtf~pxzy`-MV-vK~ zmq&bm*^s01M{B_Uh#RiO&9NAYRb6_(1B@>KqC|IK%l^45X@59l|e4$nJzpL z$YXwdCs3Z{m-h9SJV45tA2oBzgH81H2_Wl?&?Nm7lTkYOrQ@ZHGQh_(6=9Ac#Cwr# znS}V^T}CGIUgd7TT5(@HjtW3=(n5Q5YAv#A#Yz2h)Azfw`5~AH6K}CcL z6yzpUsGwp(MGErJMBNG+OSWRF_DDA+1U(8GM`)~q#uF-0P${8t5yaPcj`S;=PmOPu zM(KC=SxPgbP18WuM*8TaQ5fa7S^6z5vu!ZBMWV~l12TG6;9ZTAmImODR0U@Rs!{L? zc)RK4O#U^<7oV3y2JUTcWEps^d6g+$Di=mJdNN>JM`3t%%b$fTHwDc=6icBL&ayUS zt=ag^whQ{3a{-3iq)m?<^XD!aPyNXWW)xwmf&@Zk3epfNSCE!ate|v+CMY&Np^12V z{$V~*ngI#!Y0kqRw-1{*;yV5TG2GUX!}fLEXVu{cU9CF)#-b}6SiCFEFfuYC>S06- zkF2<@7fzqX3%#?cFg~Y$Q1Ex)U#aDt-HBjyt#eXxu0&wix6Z-L?|X{h80TsE>g4iM z{!9BmSc08e7akfmnCs@R{?)D58@C?m2-mPFePeLw(NcG!GSNGHbG<CH^cf+_hKRzzgz?R^#qvUOAB;-RLc`Vy{2m#I>bwQ8 zYhaSb$9CXz13ir4t%06SUUbn*!{jGHFeqxS;(ETH+93$hCy+7aNV z9KervlxuIkr~3#kgOg}Qedrs^6>dQIvB9-UC0uy++s3^swNz=mkmXAN^zE|aj$PH3 zZK?#Xfhs(+tLfpiqkZ>u%l1TWc*XAN3`2t(@H;Q%W5G}^whp!IU1|3B&WGh;zPP9Pdrz%uKXyc{dGqCp!`)H+<>NCyynm_5e5!SD>D=OypNFpw z-7=W3yFV+r67YBK3m(ySzxMP`!*A~|(>_#@`wqGvD#oz)V2hUB2oD~1YP#yG>uT$2 zNT$|R)%oMalbIgq^w08;bt-Kj84N$^ZZW delta 4265 zcmZ`+4^R}>8GpO?hrI*tAIIHs9Ncjra3JJ>1Bwwi;N%bx0nM~=Ohgon2`bSj~t)|qIdwT*3tG)YO)sIi2psj*46-`l%eZqK{D z`S$JaeZTkpdGC9BZ+Bf{cfH5%U(9%p*PdaRLQt^>%f1%`p_UNRj8crU5akY(QWUE5 zVq1n%jbehaosQCd;jP})&CP`Xf-qjaKlqfqYm z6J5VOpxneAbDlpt`d6k19#%fVrnSN?<^4K;r(NtE6qT@5wN>{~Fk9?0yh&SrP9-pK zPm&!nv}Rbwaqy+a0{`S}@Bn9lZ#X+Bv_(*>;ouzhjcd%X8`}ppHaNuj;4jE+(s~a#VLLb$E%Y0w;H1gMn4u0WrqerYGI`-1g9%R zA^#S*j&`&W?NdhM!Q_LxS8KWaA!YXmb6{N3UiPrC2Q|Mpgak=24B`-cp70t3* z6R_0LtksEFNztssiC8poDXz~Fv1lzxtYTZ-xZZ7-4e)Y;>DEU%E|xFQitmg6&tSh5_a6R~7Dx-%2RCChO`W>kGc zW=!F7V&URjBYNqlV-3e;xg9a?LoA_QW^02Z+Px#jJ>54fx)#oy7o^IYjvk`PN-*S| ze@6{jk(E~|+mK0d@`}#F6~5r*tUR}DWF(}yxj8AMBslI$gV$VjaJS0;XOSUC zj~<;L63(o?zFv@=Wuk@4+3xvQ4C{<~#Z)+BQl$Zlv$Knl?80Ntm}!rA7p_juv)*>b zOh|+!ODleiJ@F?*c=wQGKQbXb^QqW!Vxp%W6}Yyta_G&86Fp_g_R_ILEZJVVmWUFTLUR(7y@sl}{^-F3yP)C!}eKEEw&JEIMz_Eit+}>5+wKnEKwf z)gLe4((|*G)xCFi(5F#iAj!?J*0v9xgc<4m$MEYNf4)0)r35M;o*v^Hs(!=x1Ux!%Bni(`Xoft1?I5=2 zu)Te!!$?5t6-lHkV2(Fh_FDCyO+EUWBGtXl+ zdWqI+sJ|$EDoK^;bwnrA>q(kSZzdL*-U{kq1MCPkf}u+dQ$d^cJ3>zYg!sjK2rP+l7wa$7r^3EPEuIlSjgW-;G&qW`aR_MCCBQi@U9Z|Z3EQoMg!b~e7tAuQb=+P<^ zXa=GT3E2^i*d>^WFjGPfMD(N;8kmJBOG4R*vL)n1gr%vOV^D)nTK-D6h2dX& zsgr@8W6KY${0~#X-&na+r5<`{$@ad@d|=hyB$_GC0U`XQwb#|GAi(MS>gz~lkWpnLV? z)RjN@-#i->uUM`aeP7^7hsF3UU)4U8I!FAuVhH@v#d0CvlM~ zmi855AH}e0N53fryM65Mkgg(=;xxj=9eGMU?mxJ-BS8OIpkb(%NrRCg4}0Va{Bo!} z5*RyNL<WZ3DHr(&UR>g9xn&n)+va(W`d?cX!E{P1n%p)G< z9_H&0!MJmwf*F_r|4tkG;RwHK=X#ZTUEhGlJH(&f^`r)i92XTY7F$9lx-77LUzKrb z%;c8AoBNt?pK>sdEi$&na``o5ix^ #{houseHeadId} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml index db5d769d..b3fc8da5 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml @@ -148,7 +148,7 @@ where DEL_FLAG ='0' and MOTOR_VEHICLE_NUM is not null and MOTOR_VEHICLE_NUM > 0 and find_in_set(#{motorVehicleCategory},MOTOR_VEHICLE_CATEGORY) and RESIDENTS_NAME like concat('%',#{residentsName},'%') - order by CREATED_TIME + order by CREATED_TIME desc