From 5e3b3a329e7cc8de67830effb1ed683734709665 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Wed, 10 May 2023 17:21:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=B4=9E=E5=AF=BC=E5=85=A5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcBuildingDTO.java | 1 + .../java/com/epmet/dto/ImportGeneralDTO.java | 7 ++ .../epmet/dto/form/IcBulidingAddFormDTO.java | 4 + .../epmet/dto/result/IcBulidingDetailDTO.java | 12 ++ .../com/epmet/entity/IcBuildingEntity.java | 2 + .../java/com/epmet/excel/IcBuildingExcel.java | 6 + .../com/epmet/model/BuildingInfoModel.java | 6 + .../impl/IcNeighborHoodServiceImpl.java | 103 ++++++++++++++++++ .../main/resources/excel/building_export.xlsx | Bin 11432 -> 11696 bytes .../resources/excel/building_export_0510.xlsx | Bin 0 -> 11432 bytes .../resources/excel/building_template.xlsx | Bin 11478 -> 11754 bytes .../excel/building_template_0510.xlsx | Bin 0 -> 11478 bytes .../main/resources/mapper/IcBuildingDao.xml | 13 ++- 13 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export_0510.xlsx create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template_0510.xlsx 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 702294f7ea..a16516edc1 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 @@ -166,4 +166,5 @@ public class IcBuildingDTO implements Serializable { */ private Integer realPerson; + } 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 179d7220a5..1c25e75f50 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 @@ -1,5 +1,6 @@ package com.epmet.dto; +import com.alibaba.excel.annotation.ExcelProperty; import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; @@ -216,4 +217,10 @@ public class ImportGeneralDTO implements Serializable { */ private String floor; + private String buildingLeaderIdCard; + + private String buildingLeaderType; + + private String buildingLeaderTypeNum; + } 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 cafecc1f1b..d4c2af991b 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 @@ -150,5 +150,9 @@ public class IcBulidingAddFormDTO implements Serializable { */ private Integer realPerson; + private String buildingLeaderType; + + private String buildingLeaderIdCard; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBulidingDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBulidingDetailDTO.java index 10e8e09477..590be5782d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBulidingDetailDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBulidingDetailDTO.java @@ -121,4 +121,16 @@ public class IcBulidingDetailDTO implements Serializable { */ private Integer realPerson; + /** + * 烟台需求：楼长身份证号 + */ + private String buildingLeaderIdCard; + + /** + * 烟台需求：类型：0楼长；1单元长 + */ + private String buildingLeaderType; + + private String buildingLeaderTypeName; + } 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 117a7ea6e5..4921e1f878 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 @@ -132,4 +132,6 @@ public class IcBuildingEntity extends BaseEpmetEntity { */ private Integer realPerson; + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java index dbd7f8239b..52e7a2a435 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java @@ -130,4 +130,10 @@ public class IcBuildingExcel extends ExcelVerifyInfo implements Serializable { @Excel(name = "楼长电话") private String buildingLeaderMobile; + + @Excel(name = "楼长身份证号") + private String buildingLeaderIdCard; + + @Excel(name = "楼长类型") + private String buildingLeaderType; } \ No newline at end of file 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 2339587a1f..38df15fe5d 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 @@ -44,6 +44,12 @@ public class BuildingInfoModel { @ExcelProperty(value = "楼长电话") private String buildingLeaderMobile; + @ExcelProperty(value = "楼长身份证号") + private String buildingLeaderIdCard; + + @ExcelProperty(value = "楼长类型") + private String buildingLeaderType; + @ExcelProperty(value = "排序") private BigDecimal sort; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 6795750504..038ad89a68 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -123,6 +123,12 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl page(Map params) { @@ -625,6 +631,14 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl manager = new LambdaQueryWrapper().eq(CommunityBuildingManagerEntity::getBuildingId,info.getBuildingId()); + CommunityBuildingManagerEntity communityBuildingManagerEntity = communityBuildingManagerDao.selectOne(manager); + + + if (StringUtils.isNotBlank(info.getBuildingLeaderTypeNum())&& + StringUtils.isNotBlank(info.getBuildingLeaderIdCard())&& + StringUtils.isNotBlank(info.getBuildingLeaderMobile())&& + StringUtils.isNotBlank(info.getBuildingLeaderName())){ + + if (communityBuildingManagerEntity!=null){ + communityBuildingManagerEntity.setIdCard(info.getBuildingLeaderIdCard()); + communityBuildingManagerEntity.setPhone(info.getBuildingLeaderMobile()); + communityBuildingManagerEntity.setType(info.getBuildingLeaderTypeNum()); + communityBuildingManagerEntity.setName(info.getBuildingLeaderName()); + communityBuildingManagerDao.updateById(communityBuildingManagerEntity); + }else{ + communityBuildingManagerEntity= new CommunityBuildingManagerEntity(); + communityBuildingManagerEntity.setIdCard(info.getBuildingLeaderIdCard()); + communityBuildingManagerEntity.setPhone(info.getBuildingLeaderMobile()); + communityBuildingManagerEntity.setType(info.getBuildingLeaderTypeNum()); + communityBuildingManagerEntity.setName(info.getBuildingLeaderName()); + communityBuildingManagerEntity.setBuildingId(building.getId()); + IcBuildingEntity buildingEntity = icBuildingDao.selectById(building.getId()); + if (buildingEntity.getNeighborHoodId()!=null){ + communityBuildingManagerEntity.setViliageId(buildingEntity.getNeighborHoodId()); + IcNeighborHoodEntity neighborHood = neighborHoodDao.selectById(buildingEntity.getNeighborHoodId()); + communityBuildingManagerEntity.setGridId(neighborHood.getGridId()); + communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids()); + + String[] agencyIds = neighborHood.getAgencyPids().split(":"); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().in(CustomerAgencyEntity::getId,agencyIds); + List customerAgencyEntities = customerAgencyDao.selectList(queryWrapper); + for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) { + if (customerAgencyEntity.getLevel().equals("community")){ + communityBuildingManagerEntity.setCommunityId(customerAgencyEntity.getId()); + } + if (customerAgencyEntity.getLevel().equals("street")){ + communityBuildingManagerEntity.setStreetId(customerAgencyEntity.getId()); + } + if (customerAgencyEntity.getLevel().equals("district")){ + communityBuildingManagerEntity.setDistrictId(customerAgencyEntity.getId()); + } + } + } + communityBuildingManagerDao.insert(communityBuildingManagerEntity); + + } + + }else{ + if (communityBuildingManagerEntity!=null){ + communityBuildingManagerDao.deleteById(communityBuildingManagerEntity); + } + } + } return building.getId(); } @@ -680,6 +748,41 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper().in(CustomerAgencyEntity::getId,agencyIds); + List customerAgencyEntities = customerAgencyDao.selectList(queryWrapper); + for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) { + if (customerAgencyEntity.getLevel().equals("community")){ + communityBuildingManagerEntity.setCommunityId(customerAgencyEntity.getId()); + } + if (customerAgencyEntity.getLevel().equals("street")){ + communityBuildingManagerEntity.setStreetId(customerAgencyEntity.getId()); + } + if (customerAgencyEntity.getLevel().equals("district")){ + communityBuildingManagerEntity.setDistrictId(customerAgencyEntity.getId()); + } + } + communityBuildingManagerDao.insert(communityBuildingManagerEntity); + } + + if (null != info.getTotalUnitNum() && info.getTotalUnitNum() > NumConstant.ZERO) { //设置楼宇单元 List unitList = new ArrayList<>(); 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 5a178ed9bbd2907836ef56358413d3d8db683b3e..d1cad4c5560a387e821cd06056ab4b93983d127f 100644 GIT binary patch delta 6974 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 delta 6712 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 JWBaSde*s&?P6Ge{ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export_0510.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export_0510.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..5a178ed9bbd2907836ef56358413d3d8db683b3e 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 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 N-hjK^U+Esa{~u4+SW*B0 literal 0 HcmV?d00001 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template.xlsx index 0be5175435e162cb2d47473f7705389bb489ed83..0f597ecdff17753b7baa9d91b74e9c699c94cc4b 100644 GIT binary patch delta 6966 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 delta 6778 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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template_0510.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template_0510.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..0be5175435e162cb2d47473f7705389bb489ed83 GIT binary patch literal 11478 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 BUILDING_LEADER_MOBILE = #{buildingLeaderMobile}, + + BUILDING_LEADER_ID_CARD = #{buildingLeaderIdCard}, + + + BUILDING_LEADER_TYPE = #{buildingLeaderTypeNum}, + SORT = #{sort}, @@ -149,7 +155,9 @@ c.ORGANIZATION_NAME as agencyName, d.GRID_NAME as gridName, a.BUILDING_LEADER_NAME AS buildingLeaderName, - a.BUILDING_LEADER_MOBILE AS buildingLeaderMobile + a.BUILDING_LEADER_MOBILE AS buildingLeaderMobile, + a.BUILDING_LEADER_ID_CARD AS buildingLeaderIdCard, + if(a.BUILDING_LEADER_TYPE = 0,'楼长',if(a.BUILDING_LEADER_TYPE = 1,'单元长','')) AS buildingLeaderType from ic_building a LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID and b.DEL_FLAG='0' @@ -453,6 +461,9 @@