From 34b9a4cceb3b37f23f27bfa2b640b5afe476ffd8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 31 Oct 2022 10:11:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/EnterpriseImportExcelDTO.java | 7 +++--- .../IcEnterpriseExcelImportListener.java | 21 +++++++++--------- .../service/impl/IcEnterpriseServiceImpl.java | 6 ++--- .../excel/enterprise_patrol_import_tem.xlsx | Bin 9302 -> 9306 bytes 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java index 64c847d684..2622dfccda 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java @@ -27,7 +27,7 @@ public class EnterpriseImportExcelDTO { * 默认0 */ @NotBlank(message = "场所类别不能为空") - @ExcelProperty(value = "场所类别(九小场所/企事业单位)") + @ExcelProperty(value = "场所类别") private String placeCategoryName; @@ -56,10 +56,11 @@ public class EnterpriseImportExcelDTO { * 2:21-40人 * 3:41-100人 * 4:100人以上】 + * 改为手输数字了 */ @NotBlank(message = "规模不能为空") @ExcelProperty(value = "规模") - private String scaleName; + private Integer scaleTotal; /** * 场所负责人 @@ -108,7 +109,7 @@ public class EnterpriseImportExcelDTO { @ColumnWidth(20) @ExcelProperty(value = "规模") - private String scaleName; + private Integer scaleTotal; @ColumnWidth(20) @ExcelProperty(value = "负责人") diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java index 7ace7c5c5f..5495dd6ff6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java @@ -54,6 +54,12 @@ public class IcEnterpriseExcelImportListener implements ReadListener dictList = coverageService.dictMap(customerId, CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode()); Map placeTypeMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getLabel, IcCoverageCategoryDictListResultDTO::getValue)); //2、规模名称 - Result> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SCALE.getCode()); - Map scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)) : new HashMap<>(); + // Result> dictMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.SCALE.getCode()); + // Map scaleMap = dictMapRes.success() && CollectionUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictLabel, SysDictDataDTO::getDictValue)) : new HashMap<>(); + Map scaleMap=new HashMap<>(); //3、当前工作人员所属组织下的网格列表 List gridList = customerGridDao.selectGridList(staffInfo.getAgencyId()); if (CollectionUtils.isEmpty(gridList)) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/enterprise_patrol_import_tem.xlsx index 4be3184e6c178ac5b260efa8ebeef20baada39a5..8a3e054eaa4fec430d85d648d20b8728c9529b0d 100644 GIT binary patch delta 1545 zcmV+k2KM>ZNZLrSlK})zoAJ|BM^HK| zWsH1}AO|EbMJAUqx=v^A1UcF;DOg@gh|vZ#nkL6b5w9pO6KQt{A^(OTYmkV_bk?f*FPzpj-7sv_lHsBdZ6Mw*bL0 z;OutHU;i&F|ye`NdT` zs+-AXR~%3h2~N2JW=fTOy}x~IU+szTpxSIOXWGo|vKJYM(@pZZefoHQiSTd5;@b2b z6NF>)&@TO6xe3qC(-}$v5(F+8yZ$5%0y-)>p@iHujSt>8`MN@}YyTh7CvNDcB%owO z!*D>{1CloP;h#vp0Z>Z=1e2j58nY?`l>rH(?3|g>0{{T^lgI=gf5lcyj~hi0z9aD; zMt$I9&uhK5*VvABy)lVIq=-j2_s+EK(e_MFdfJ}dTR0Fw9R)kkTY{DfgkOJ&F zgkLk`;D15&yfTAf*-Jzp+}+h*Ree=mUE}VBJ(nso!UKnSJ!GglQix|U+wsOd^!|Ip zdK)Q$z@CjM^GFZvf0F=R=)eA2H)MP_m=Gcqu;2wfG!eq@Xj))Rh>HW2`NV^h5#ufv zu;pVd@HxSDqU2J|)b*z3V#hnD0*gIvDmL zxE+T&Vm}EtCq%?cJ7E~Ap&zK0m$4`%$Y^Oq45oo#?lu+}^}ERpT;*E7YderddG!h> zqaNBcI+qLt@&s|sAz@HjD+2GlODM4fv7uCuB1>S0v0Vwg3?g0HP5{y(wuCby143yJ z4c4HFt|vZVe+dq>!b5qTdmAQ2bCoML8R01v14ch^Y%%Gfw%RU_4U|LPVc{j>j3)w^ zHPi-D*i=x*BX5%#p`hPGE$P={6r8}X;ySY4k>cXLG?>(ZX{e3zK#G;5F7uycr%*RD zb%-v^)OB^OJkC@HmWg+mGj*e_wn_uu-WlH4Gj*7AfA5BBmdBau%}gEUT)n9p<#DEZ zD^mxKIr)wMPMwxsKyv%C8v9+&LIqwb+=RTlHRwNS$i;0!<@i`O7^BmM0<$D~6W~&U z6wnDkI_v9QZ3eYuWr(d+gi%EdRuN_uvAv2|t0FG0A{tf1FhxM66inBvh__M%)KGzF zRuS+fe`T~~M5{n(kih&6r5Uv$uh%ejV3ti$vDnm;sf9FEj})=*LrbSlAdrG7W#JaZ z-foiDV8X)7o<9{=ND$yLz$6I}UgVtdiZFfGTPE0--F`~3(SPIml!-T^)34*7K8wGa zFFv_Zi+=wwn%|C29>jO=N6+u3h^|(sbhRqGe^<(O)9h>-dZWGGYOc~={&287I?iY> zp4|EK<8R_0e~wNMGSQ3YpT`G}Ys)Wxjqe@D_ix7Y!`h2KK8=r07f%ltzdX%h_r8th zkKC@Fx#y@smf3hu_uWJI|J1d|z7}ezbga^Z!l6(CiHVH4%m$&F9gxqv+&z zS3 zn4eVP4ioS#OO_M(KS7`$=qi9mjEQ^$tv)>)CPMkeDgLnZ{{oO6v$hDq5DCFR9{BM9 z004KBfEmj`*yWz~?0PzXJ`TAFz0a3#z#%th!_&D9=yETXw>(?15JPm!{1;mmKiRbl zL!xoY^Ub@TPucon{al2cJ}}_yv#1)o1p%d#WFSBU4IBUflRhFAlfEDt0Wp)=Ad>`7 zoZz3%l!9X7P@c;k-cL4wZ6aWAK000000RSKX004@Uw<19S v?34K-Isv(pG$S?v;FD`3Kmo0jtRr3tqwJiS(gOeh^^+4MJqA4>000006j#;! delta 1536 zcmV+b2LJimNY+TOlK}){oZpU@luhjr<9%FW>HJe{J15=wnC^22dTDH|r9FhcH{#s}}4d|jc~w*QY95}%IJkT5!6 z!*Gwd10-$k!#|OH1G5YRvjGVtYO|oR0{{R=lgI=gf3;RkkK05Tz9aD;tT}K>{I%I6 z8X?5(h4(EFc4P zNCdhte|-C`e$4p3m=Yp2kPwIgno1e=3`00m;$xw+kOXiuX57aTwtQlUkQ3}Gl1~lW zG~0%cy#Qqrdi*>x*m&$YWS2RSPXd_<;e=ud_KT?(ibC3fdoFn{$1(U?*i$iaH@hk2 zS*t1ddTQxs@XHC#Qe+0|Nd_M}CAUFi)_B`szL*;H^5Rre& ziQ`z0L!moCZbcvT6ClZqRyI5j0?5hl1=f<$_dJx4l^%^JR0ot~Dmn{V63USLL zv8b#yiT7?2N*qaCC>5loC9ucXehRz-M`kKp0aA(Bk=~5#5K0H=BA~@>r303rz$i6T zf7gY!kt&+&Tyx17M^x@G`l08_=>T>0Zgp&-0&;`Jmx(u-O0cY@w~)pnNxgtvB{M>S zKR}&Sufr%PfnUw{(t1alj}J0uG6lA!x2gkajtX6_Um0K0?VP>=vB>GBzEK@#(!oll z9p;>Fb@fhVz}q`R`({puxzKLuc6FRde{bh>m1=5BjTzLElOt5c z)e%-5v9m72t|NBW5gT>HrFBHBju>SKsFc#u%{t<}3;{J%BHDEXyvfwtDxy;&e+&p< z@rJU9x)9e}n0hd$O;K}L6o6-nM17x|^LgC`#LYM6oq|=XS*8yQ?3LRwt*)*YoA4A2pWG z?*IA8H_4AbEnXhwN3VZ>kQ_a2f2_XxC3$$7Ji43Aj~lQ5_&hm%xqN=S{P}qSd-&~Q z{xrGwIQjKt@!Q9X7hg7#XHS-oziTA-U#-6QzOg*MvwCtj)7dvlBlbO z*9gH72}E$vEe-(y0F{%W8OvQ7Pj=3Ix}hJUT>r_Q#wWYFpX`|Rw0G*0y}g>)bw2Ic z^>qGx9C8zSpD*8lLvGH7r*j+7xaV9UPO8A`lxyaL_Fd0RRA%0RR9L000000000103ZMW0BMuEB0&Mmll>w(0hp6G mBQ^oQlW!wH0jZO)BVGw4YO|oR0{{R=lNTgC200)A0001*ztFk>