From 08a5630c654c343722c58cbceecd5529031b2d59 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 26 Jul 2022 15:26:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=EF=BC=8C=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E6=96=B0=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA=E5=92=8C?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/govorg/IcCityManagementEntity.java | 10 ++++++++++ .../entity/govorg/IcPublicServiceEntity.java | 10 ++++++++++ .../com/epmet/dto/IcCityManagementDTO.java | 13 ++++++++++++- .../com/epmet/dto/IcPublicServiceDTO.java | 10 ++++++++++ .../form/IcCityManagementAddEditFormDTO.java | 10 ++++++++++ .../form/IcPublicServiceAddEditFormDTO.java | 10 ++++++++++ .../result/IcCityManagementListResultDTO.java | 10 ++++++++++ .../result/IcPublicServiceListResultDTO.java | 10 ++++++++++ .../epmet/entity/IcCityManagementEntity.java | 13 ++++++++++--- .../epmet/entity/IcPublicServiceEntity.java | 13 ++++++++++--- .../epmet/excel/IcCityManagementExcel.java | 8 ++++++++ .../com/epmet/excel/IcPublicServiceExcel.java | 8 ++++++++ .../IcCityManagementExcelImportListener.java | 2 ++ .../IcPublicServiceExcelImportListener.java | 2 ++ .../excel/public_service_template.xlsx | Bin 9096 -> 9133 bytes .../resources/mapper/IcCityManagementDao.xml | 4 +++- .../resources/mapper/IcPublicServiceDao.xml | 4 +++- 17 files changed, 128 insertions(+), 9 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java index a1baff300a..fff25b16f4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java @@ -73,4 +73,14 @@ public class IcCityManagementEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java index 6a454c446b..1422ac76ad 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java @@ -73,4 +73,14 @@ public class IcPublicServiceEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java index 7e36b065b9..a10cbd4ad8 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java @@ -1,8 +1,9 @@ package com.epmet.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -76,6 +77,16 @@ public class IcCityManagementDTO implements Serializable { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + /** * 删除标识 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java index 64045ddd17..d516ccf863 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java @@ -76,6 +76,16 @@ public class IcPublicServiceDTO implements Serializable { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + /** * 删除标识 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java index ab73efa810..ff0aac0dc2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java @@ -62,6 +62,16 @@ public class IcCityManagementAddEditFormDTO implements Serializable { @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class) private String address; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + private String customerId; private String userId; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java index fb9cbf6b26..226bb921f1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java @@ -62,6 +62,16 @@ public class IcPublicServiceAddEditFormDTO implements Serializable { @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class) private String address; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + private String customerId; private String userId; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java index 6c40cb030c..ee36eb853d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java @@ -65,4 +65,14 @@ public class IcCityManagementListResultDTO implements Serializable { */ private String address; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java index 859b36faca..3fcae16a22 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java @@ -65,4 +65,14 @@ public class IcPublicServiceListResultDTO implements Serializable { */ private String address; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java index 8a90c40380..170449ea1a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java @@ -1,13 +1,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 城市管理图层 * @@ -76,4 +73,14 @@ public class IcCityManagementEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java index 5c0e35ec89..30b8513f4b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java @@ -1,13 +1,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 公共服务图层 * @@ -76,4 +73,14 @@ public class IcPublicServiceEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java index ffda552a3f..bdd6f5b587 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java @@ -38,6 +38,14 @@ public class IcCityManagementExcel { @NotBlank(message = "地址为必填项") private String address; + @ExcelProperty(value = "联系人") + @ColumnWidth(20) + private String principal; + + @ExcelProperty(value = "联系电话") + @ColumnWidth(20) + private String mobile; + @Data public static class RowRemarkMessage { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java index 3b9762b677..872b2fd61b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java @@ -38,6 +38,14 @@ public class IcPublicServiceExcel { @NotBlank(message = "地址为必填项") private String address; + @ExcelProperty(value = "联系人") + @ColumnWidth(20) + private String principal; + + @ExcelProperty(value = "联系电话") + @ColumnWidth(20) + private String mobile; + @Data public static class RowRemarkMessage { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java index 5d08ce792c..df763d3c79 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java @@ -95,6 +95,8 @@ public class IcCityManagementExcelImportListener implements ReadListener%{ohaN{(l0)2wnI^J?Yao`N@tgkBhHHeI5BF|S_ILSLr(yqoiocu%043X#Z`Lmob zn{XDSUV(*-M&o_5MXq>Ani;5DvN$D7hLtXPnX?9*wgrO-mEebI8w7Urx8J%oFE>rU z-BfT&XqXw!_N`#P1MAMfVj7%HUFip2=)--QD*vK+t zpG-#`9S{H6Y}v6Cj1z<9@2Ou{w2V0;vnYD%%Hhhr_glZQvG=Rf6Nga04Vk*#@rs(2 z=*zE~!OfPlp;TXPi|EsgY3~Sk{S&wfe6v7v9#kas>*P~RC-|WrArUpnrBpS4?Xufi?__+7ylFf(G z7aiFvmAx>xaK6fs%ZUi#nbCPOZ&;&ZA@I?N)`%WaxA}6M=Rt^f_on)@Me`s~3M&Rl zq)Jvqgl~isf1lV73FJM7#q_T2rPwYA?Pm>jHV zT3oDcn7a787{*xbCv{Jj#k=I&B)hep9u-H%hl?Eunx1YP^-^s#0V(}LSQBXN!`H;4 zjbe_SHRyy5jew$J;+(3e;aFtJ{AopMYH@n1H;gPCl}~48?P$YSW2aszOlsR%u(M{9 z<}rfetNbKb7F#N~&I-l!rcw8kAefp7?B)m(G|}+plIYYQ#3Ys4%Ju$l$uCZj_=^!- z>+VN~%Pf9bDux%-7E2U@USh4(aBZt2K#4jxtICD2LJG*BZ=Njs489g%hh-_xY zXWv@s{$KL((E@qHs}j@s6#dYH9+|l~%-Dk67CR^ohZNI`4blwcWtbKvd7&rm!7gR3-R`Ox<|~TZ zu{msZH;<^+xz5x^<)4WkD>89#=tifq#?!kgzbZam2wB1h0ZN+>v!{}gNk08Ygmd0= z^=*Y8(fAWw=k8t$o^we`*x(6SPxaisLY_+#-cC5B#v}OLB3l))V=hM}BAgl;1!=@b zNGRdV-jH+c zW2;@zNjuXgj@9;CZ6Tm>EmB{?XT5b=`)sq-o7i|$9y?8RD)~@18{^Z);vD4{KQ+f+ zGCYxuRPQlXXsaI+^L=7CBbfgC{H5EB4CJ&S_2Xm7WO5CmvG+hFy}%KKfuzL9G>#&b zK~cOHXf!Lc8X9kOSo|x~DT^S4P+R>(TeXmZ;JC2wDw@sg}!d!O})X?c^$O|jsq@Fu4{ z_ZBi%nzwN{J`2UfqSd%3WVjN~B@J3BS-iOy%FVI@lH$6b%t7rAe-E zk!&akc_r;FI>}^6w?6GB?ZHSZGjDDNxCYxh)SDfIA00-BD(UVAgm9+6Dw@n?RO&

ig6-J5hylkrAB>3%};838N=tc+QdqY@Eo<3TM3#p^s4?O&CNS z=UC4QK0ncHdBmdk$U3-IL60_c6}71Mh#JZ?M@r)PjWpA^AJrce#ux0-xM>~=D1Zh2 zI(caS=NC@4X!XX&#vn#s>s_)K3dCNtrZ_BO$#oc^cWa)Gde#rijNzikB~p<_ z6W@7$sgD48_<>N91c>MKup3J9UU3d zXJ~|_QnBW@^pdP~MDE6kK%82EsMUoAwoN{v29I0j#BvXB!dN}GS86>#qP0c7fj*?t z1;;6=E?)IbGrl{){_xgXSC`*~3+nNm%JNMgb$7?Paz&p~m$}NyZ~WF>=vCi5)xxgi z;jiXA#OT%(lW5jm=vtBZyWmB)Egw3^ZrJ8Rd1~mZ z`x04z-QBkw^K@Z#$*mTI~ zH4@&9AkeUh#AdyYlW=zgWlH-{`=QJRo>D%qG7#QF3DJ0gERYX0k!)W&NSh;(p7o8$ zx$VH|aLV1=>`&jqFGv*l*q?){NSyf?M|n`%0-x5npWhyuv}A?@39Ug0FXj80SO%Z? zcc$ZYaEa(`e2qnk8|qoCJg+98FsQn}J0`Fc&1m4R%U#Hu@QwJqZLp>j(}Zwmv3glzir9kJhT{?I zCQr>Aw7Ozo;Gy?|pn$}}wMQxjB2Ao#&Pzs<$L?AxXB=P(a!~i~1MNKn>sp;}QR~f0 zA!j~kr|g-TV!Mg1H>?m`D(_BGo`km@v6u5CcAW;D)w~2Su)KtPC57wL-YpMU8rPke z;Mb4(^qmppqasYAiR3=Ak>ovM8w6DE2%Zr=l?arn@IGE|!o&MXWJAs_R!*;+cxhx! zB#DQgkn*xR1xCmh$)zeM#V55;in}SVh0lI6XUfI3D^^|toXPoDQt0@s@2?2<5!npF zq4760k`(~S)!VMf`n!JrT+iRvlroY{j6IlxHb@!w5?|=`5}Tr5#V7r$5*r~| zE_FrQIFfSHaZzuh66B{#cn*MyyIi^7Q4~tgnBSJWnxC%rO)@h~b8?M21fEP~I3~YZ zfAOu`iVGYI3N!!t;)_$yv~t&ZC6i&kMCL&4MC5CrjPKNQAJv&P9?{ zz}UD?D&i3Lf}&nb|Mx(bA)o&>r_P6oOUau7bv}2V_UGr;onwrM<6jdP@aNCxUf_K$ zmM;%4Ut*Fwts4g(hHrU+MJsIh^QF<5JbWU5(ho*qR~Y)<6bd%en2qB@{!RY<2YdIB zMKIv^0jIvTl!LPxyRmXNno3-(zZRX}^C~Ls`-m4&QDP0-`t6A)MS|66m{G_FnFk+| z#<7g= z3^)xsIye5n#bVUMds|yF?gd-7U5Uz+2__RrekX_tH3 zjGkz$YfLyQ%+W5U;U^4;matFfAENX5N-$)MrCUd3-C7eDZ{>RdeO*=6sS0@~EfG0Z z5*WG#=KJC5+_RHM&U}m*rL66t9nliX5QZ;=K^YiHveHEK$L1BZ2;0HLugYczxd3&= zRrx!}6w0&_HKI^_tV!J)mJZp^2}A02$H zpB=v2D~4+f_2+0<x3x&X$$W&lk zAV@jXUwyet=4iM1;$+Vc+tlC!IH#4?FH|wNnN~JB&nc#5jn6F3NLs{|`h?fniwumSR`5* zuMjkW8$ZT4zYD>*ZM*!pTrR65lR5vxGoSsD%zs2Q@DJgH+j!Z(F!u3sa(DcPceM~0$eu6SF(u?hc{$+Kr`&?0LzDEVxEn$N3kiCttL*xzTTzJD0GD0QiV|~Bpsl(Io4i9)85T% zLuVDyy(f)KfIIM+D(_^Mp>j8fT<#wjUPV*x?FQBL-LG*#*EGl}=DMX58Z-XXbJ|;+ zqDs!jdsbc=%~qUNRGbC$>$=xp0d~HCVsl@Sq#vQ;mE}nNb7c0fT95z6%Z>;k&He|g zfj@)lU;NzP!^_3i!^7oohMs6N^am+w9Q2Ut>tZ?PnEQ2>iCXA4VpD=Zxx>=B?-{Nc zsa=k_WP_-Qz!OQu2CFxQ_Zti;jP6>f-xUlkbOUlt{GRuo&rOVo*1n2NQ&WtW4YG;! z^$u=gwUiH%_qW!twxbNz4H*bF+g-akeuG}>BxV3^#n2ZHDHO?J zNne4nRd1WbQ&lUoHg4(DK8)8mva1P-beI%OY;S<_;Q$(>Pri(VsBK`XP+^sg?ieLP z$7(n%3flz}GMH?4G6H*q7`PLL?f8{>#$*H`T_2jYt*}gX8v69~RS6x5Tu;EVN?RqR z6ompuq6N0v?z+RBG|AHAIBcLps1?U5hPDNgbai(T$A$n|PQ{Rr!rvq*tPQ3R6(WLD zcFaCI1Ez{oh{zi9$EWe+X2cwDvVtQqjOyr(hsZZpeQu6cC8{@0vgHuRG%~kD2B$C0O^nzN|2T= z0qK%@-gn=-_uY3s><|0w_1|mlz1LZ1|0)#26su8Kco7@KkIhgiSaitf1Uc1i0gC>E zz@^;vpX~c?F=HM%wJ4m<@Ks*6cSbeps^t3~pvwn0fS*zk96$!#_9%IoP}`O%VrfG3 z`tAL}r~CJ8d!x0JXuLuc9Qy5o&_(tb&gMd%dotd!&#VYy$5VBEK$aE+z4h|sSjXEy z2kInI<)~rL)v%Rv@grG;go|>h?O%jM*^WvSQ1+t-Q)={uJMq@05!hl(1(AXRY69I( zcy5u&VR}lPMwZU`6SPcXp%l;KpcYFfN3qi%22Znz8){dE$p!iM)INVnM|6T}+(+Fe zXoqS~2Q}!sH!qGh4%f>WrqnGPz$Ba`c*SrmL3BjB3B#vRAo4ueE8oyTz-sQ%er^AQ zux{^GUn8ESgBK=L*_s#3cNIo9((>~7D>JX^Q_U;jZZR>6I1~hIgzyRX+aR)?F{Yeg zxbEn?GkvafNF&h^@XfOR%UaC~A5f1lQ>E*>`>0D0Oce*00ssII0zPW2%HC$Dq;X&Y z03_G|z+(UaC4@tTv=0)X2t6RU1}0pm04+W%@Y)$tx6GJjUgXtK3dOT|fGzI*xQso`*NtKc&%^wIjt_U)T4M{$9jO{X5Br1f1aZCsCr$hhq)mAOE4}9yHBn)Sgb4M zN&Q0K)h4~ycX71~e7LYyepK9}VFs0q#)C%wbC6JF&p zPZ2r&kH|S(cK!70VgmizOpwv=?U)|qJ}zIZAdYm&Z<51uVCJ33wr|-GYaK9-78Q;w zM*`ES6|uwt0FDR%0BQirkChhLplcL4sY2>cHG(9>bQTMz4qI)l4u?rPYr#mXMx~W8 z1+y9w9-izi?;d`{;l5<@>f~5)!j&6i%t5~OT;#a#D*dhI;*l|BOiEzgtYd6?cA=|l z7pm{^_&1L%H~R$H(IUPx6R|?i#8ucrdy`+OB3+>^trnj)b-Xleeee<)`>-4Gjh+(6 zhJdxe?&X_`x`3@xfzV)XeapDj0kv_NcYwDzzre zH4nB;n~tXj+XrYU>p?b<8d=6&9W)W?&qq$Pl8nf(Z;=^!oC_>EjwyVvGnC?%&SW)R z3Khs<>H}UjU?(G=HS->U$fDDj;Mp+v8Nsw~pvUgf2f190J$m(G&j9%n<}N+v7~6nS zQpvs}{4`qjMt1=++mcyq_KvGCL~fIhTZcUb^P=v=K zd!BrH&IWJtn`m3UXJ4K?Et+zEznC3ls7hK%S+e!#?ZTulJw(N{EfF9?D4{V1!u8Kz+;tO;51~mEFK!#K{#sRzac;kx>{oyFW$>23P)z5~ zwD-H)9pGV$#^q{0e0xZ-%7pRe_UaNN1M06@Lf)R9URGUzzR1U9RMKy`?h%@_+8z+5mv5zUJi&UxI^r` z0p(px53(BGNzkK)==XN^d|rs6QB`_qSgHWQeq}}ewlBc~*ry++@=@r4 zYxc?#fo>o0YNl%U?^4+@zN`FBza#w)+$-1IB%P(ACza{4-)FgwAYDiN+#4(DW2H74 zA446NJzx3h=uq|_5a3M9Y?myx*uJaReH!upE@um`?Yov{hSJx@+o>vq!cq9vf|y%| zK>+(rNj^j0(fE`h?=MD)e3N<_I`J32f{(hi_(Nk?b9@=fTtu~DKDf98*b-_t`ilD=pIttF~ z{`|6N4~H7XU#|rw@sxK<>t;jn_NQ&!nwmlbMgtKxq*iWL?~!01BlP0Q2c$#oKeKxWp55eD<06H{Ymp8h4a<|g>0)T2%2Cv za@I9tLOpVm_w&8jTT564aZQ%NA)z}%$B?nUnz%m`Z9nIX zbG)s_czT)ry>Z`bSR8 zf$`zH-a8*Cn#o+O-tU%B^=oX;A2vXimZZc3<0F7LNK1-k+611~Yo@)-ZG7t<7i_I% zG*0kp&QNTu*#dQo&2Ve3L&E0y4soT7Qw%+|nCQ_=NgtN!6H7e~{Z}o^c*RCjt%gU>B*Q9H>WqiASLu2E>I5x7z2%)QAzsmT6aKetRJ@!@CP zcSh&~Dz7A9jtttj(e6`NWsE<} zl`>6r=+&-i99((tntmW;w(c8dOtsUT7Z(ki=M#L~V=(s51u>g0?_~_tzaR`F{VUTd zd+#%D?FTo{`WUM&%AMjAY=3aSMRZVBG*r`6Az8|Qro*Y~p9q?IKMCY$6iE6B?7~7k z<8t%t4}8souK&6r-c7w3pZne^?5?kqEKL{RnJ#J>)3HyF>pvRQ)bNt!Dw56Ip2#Ct z!p=9$GyWTdgns#edOL*BK)y+vURA|Rih3jg8z9yBwE*|o@fpJMv&GQdH)Wo;tQ^$^ z(a4ORS`kQ`urEs}MU=kbV$}%Nh)iGsx&n*u{QKwN`HxHJz-Skd!#q zK#avUpfmviesi7Dq}RUEot=DNDe-H*#~z6j)(hU2!Nh?%K}3@{0^`flvT^>NQph<^ z2q-(s3^3Rm)_BPUHF#r1-MKP@bcq5Vra$20F4A}kQPaqQzY*yoOi-XDY+;(%s3rUG z6fudVA0nG}$un#fDbAfP)Z#9X1G!rtV*7YZ8R+=Qc-FjTIe~)nCmJ45RqHDLZJYOL zMaS!H4Jr!mnt4+>f?noz!iU$flt^{30kQIemohf6|BjE|(x9^yVFJbBO*8!zLMl2a)&9Y*9w z|HWO-Yp9&#oA(1eyfDC57E0(f4gMsT^#snQxd(GaOdW|Wr zSugVk?R*k&Ubj<7Ygp-PBE>an?M-=0kJ1k;!CCVmqHUAxtu9hGwJk@meKrvD?6CSA zM;-O^!a%itS6atHIjZv+V9=N!NaPTWgLS2dTW!=qwy=VGWCQsnf+r39p~az@J;KnQ zUsMFXwwMlDJMAHJ8fF0tTwkmWe9yj>z1Ct0vg1T`Zqe2~4?Pz~TFIyS-p%eYdKS0K zWJ-B^-Hj8}nfm3)Lddh3G;5&0)>pdMz3@UL-rt$I9B8owxTGq}W~W37$IFKIvK`Wt z@{A4Kw(w^yX5SoBZ5_1tr-tDNsF7!rVpP&X*z*$2qbHBzI}u=%<|ui+jat8>Xo3I6 z3cE`Qsi62xwVNJNwT=`_i(dm(L%ZI)9^7=E?7W)@Ti&;2e;U0qB=dscK;!<-1eO%}KsL{xtAzDdc6U|6vpI6|4YwD;}m6O6pJ=ro^0L zqPmwMeMb!!{CXmmuTh{SKgeoFM**m61ecv+hwdFfdM$<~+9AFlXa7@BCH!M_u3KyiZa-HzZuvD1IvUkdr4Ym@q zv~&cK&+f=*7JJ^MFZZHIp+v`|PRSG~#nFlD-nK_jadOHnPyf5s9n`Cr1#!%Uu*$d0 z1wD0MHiL0#+8FZDqMMKX)mI4)O1ox!BtN2*o;x9PdT`Kw^!Cto&~P0aW<5`NN1N&j z>R-bKYKIGzr#{*(2!X9G)N9DT#Yj?_DG$dB#pw}l%U$6w*Jl(2z>(F~Fa5j7V9J8% zJ2OmJMu;ms!J2Ke0HMIqet8rynTr-P5M+6)UTWkz#Q!%-IhVRzxVY`>AjIS0_)U#U zqoGZp06NYeDW~$pEd9=UAkdf3+5c|DG`p|y)(R&O2wp9OFt=a2?DwiHx9QujA5S<)_8+B_Nzq~>lbp9bCbReU>&q9V=Vxr}CHINzehZ0| z_l^99cJKY(`#qOzZL^pSk(QV7_Bb;T)!*_zN35TBGZBRzSu--2KM0j?IvBn`Ox3MR z$bJz7t%NcxP-AQ(F2IE&d0Jk8k}49iHl~LNsuNEcAZbs8XatROp==Qdl}7(3Yw0T$HIEzW80d zCCgnzDs$}G_X;0$OD+lWixZ20E6$%pw>(?-p_0n1TiIAp82wa*Y%gBh8NrMe?fcF( zZ(6+{y_U|TE}P!>ZL>c?8MkDq_r4hlEp`QwN}L9~Xu<*f-)cNumHmY!zQX+%5iFp1 zX{nI$LmJ%zqzV^GH$fZH?g=k!KC>s0GBwL3aauX7DqBqP&+>60N5!Am?(QM|C!+@FHZ z9;{Wlqp)*%uyM{*Sv=8sH#AuCVo>o}Iil;t;BtajU9KS} ziC!hw4m>-2CAyt2tD_oD&`##9`9ojCvi3&8Z(QlRLWWw8(_6J`OdkEmE?5$sAj z)BznG7^aGaO#%2f!1>p({_W5|y#F}=l;}W_uyBC>|7!H_`%n~&MFL9)70Duk<%8;C xVW<07r~hgJ|6A#Qwbp4+xU7;`(I{C~X3&2kkAKGfGbI}3%L>M~XZ(lnzW@oafBpaf diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml index 2ed22909f9..051d742db4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml @@ -74,7 +74,9 @@ CONCAT(capacity,'人') capacityName, address address, longitude longitude, - latitude latitude + latitude latitude, + PRINCIPAL AS principal, + MOBILE AS mobile FROM ic_city_management WHERE diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml index 295ee69e36..3894594840 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml @@ -74,7 +74,9 @@ CONCAT(capacity,'人') capacityName, address address, longitude longitude, - latitude latitude + latitude latitude, + PRINCIPAL AS principal, + MOBILE AS mobile FROM ic_public_service WHERE