From 47c8e73d7b1ec7bc7b2b1bce3602d9a4859f42a1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 Nov 2021 17:22:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87=EF=BC=8C?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/IcHouseExcel.java | 6 ++++++ .../main/resources/excel/house_template.xlsx | Bin 11401 -> 10458 bytes 2 files changed, 6 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcHouseExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcHouseExcel.java index c606388a25..ed555f96f5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcHouseExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcHouseExcel.java @@ -95,7 +95,13 @@ public class IcHouseExcel extends ExcelVerifyInfo implements Serializable { @Excel(name = "更新时间") private Date updatedTime;*/ + @Excel(name = "所属组织") + @NotBlank(message = "所属组织不能位空") + private String agencyName; + @Excel(name = "所属网格") + @NotBlank(message = "所属网格不能位空") + private String gridName; @Excel(name = "所属小区") @NotBlank(message = "小区名称不能位空") diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx index 54d298cd18ae9f37051d4187e628de33f2c0fead..027f37bcad185979d8358f47b5fdff58f2264a32 100644 GIT binary patch literal 10458 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 GdjCJ^VfGjR literal 11401 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 UAXEKWBR~SkfvlaH?&q)n0X_O&pa1{> From dc9f7ddf3fe0d87f4841bbe94073bf34aaaee52d Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Nov 2021 17:25:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A7=E9=A5=BC=E6=85=A2=E7=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcResiUserController.java | 11 +++-------- .../main/resources/excel/ic_resi_info_cid.xls | Bin 92160 -> 92160 bytes .../resources/excel/ic_resi_info_cid.xlsx | Bin 38996 -> 39000 bytes .../excel/ic_resi_info_cid_for_easy_excel.xls | Bin 96256 -> 95744 bytes .../ic_resi_info_cid_for_easy_excel.xlsx | Bin 39499 -> 39496 bytes 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index d70a7e1ef5..6d3a4db52c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -169,7 +169,7 @@ public class IcResiUserController { } @RequestMapping(value = "/exportExcel") - public void exportExcel(@RequestHeader String customerId, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws IOException { + public void exportExcel(@RequestHeader String customerId, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception { pageFormDTO.setCustomerId(customerId); pageFormDTO.setPageFlag(false); CustomerFormResultDTO resiFormItems = getResiFormItems(pageFormDTO.getCustomerId()); @@ -250,12 +250,7 @@ public class IcResiUserController { Workbook workbook = ExcelExportUtil.exportExcel(sheetMap, params); workbook.setActiveSheet(0); - - String fileName = "居民基本信息.xlsx"; - response.setHeader("content-Type", "application/vnd.ms-excel"); - response.setCharacterEncoding("UTF-8"); - response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(fileName, "UTF-8")); - workbook.write(response.getOutputStream()); + workbook.write(getOutputStream("居民基本信息.xlsx",response)); } @RequestMapping(value = "/exportExcel2") @@ -398,7 +393,7 @@ public class IcResiUserController { fileName = URLEncoder.encode(fileName, "UTF-8"); response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf8"); - response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xls"); + response.setHeader("Content-Disposition", "attachment;filename=" + fileName); response.addHeader("Access-Control-Expose-Headers", "Content-disposition"); return response.getOutputStream(); diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid.xls index 41f5796a53c1efecc03f365ebeb7c055cd0efdb1..97ae081ae55cda9043f0912bc8f089aa817deec1 100644 GIT binary patch delta 1218 zcmZ{iYe*DP6vxkPX5Dtjb)9t|BsF{Npb?obw$f4|&D5kIMf~EI)(28x zp>RaO%ufad5#bnuelV~U5=tXU2p^FU1X)BG`l0R4j4Q^rcVOn;-~XI*&tux=HEr{n zr|bK4&_9x!4RqnxeP@XmMaH)KZekK}lS#%=HX5HW0W&4E4KfCW`;n z?NIkX)^#Mk++G~08fR4%dRwdRc_xbY#1%40<3n+?vK#d(HwW-1@pG-F0 zg%ASHZ~}4C&FyCg^waSK3X%w9q@#CxdpyfQ)~)(!H-Wj+1QI<8bY_x8XMY(H*vBsh nC&r`82+#6t{L#viw?veyw8f>|SsXu6K_)^-`}kHh(Q5w!2Z}(1 delta 1120 zcmZ`%T}TvB6h6n9U7K0goZWSuT~~Ll(9ECJ!Ym)!)uJ>>SvBzo(y}ZHRO|;VD2a?f zqT+}PDZWGygb+@&U=Kz=hDfF5gD;hlWE4qI85w1FXI!ZkAMU;1eBU|WocZpwkLlXS zbhoA>g!Y!gtWCf{1bvDqqZCdKE(B`fl4%Ps(<{b2W#=4cr7kX$RxxbSIp_{Mn|KRd zU^a*O z3PH6rOLdV#>e5VU%e>X8@+-pX*DX%d5aq6t!_*8_jSlf$jg3RjAt&&;Dj&DROOnP5 zDsK$&6Touv%5>7`LOmIbJJ?=sbQjq|1z#7VgnMcu3s;NyKR!G}EnF-07*m~EpoUOy zuOwLwR(1h))l*N!QK`<28V=Pg#ijKMR2%KKnL_H~*swU2o~}i!SLNKijEfeosBkN1 zIKE=|{fsheDoRI=HhGfHJUYUBArfnRRTXbao9lPi9q=8x&;brueKDwr__DOO+p}-5 z1w%rOYDHh*>w&MO^12b09W z8U#-oLQ1wu2DT>Rv{eXr5QYj75&~H{IOZZ(SyXo=%KZ8#4ebF(B}%;X5HjS_=jdf$ X0jF=C8=VMjslh=#9uNGe$H>S(+|ML( diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid.xlsx index 436e337990332d882b6fa3b59ec5ad28a0394e10..cbf3c50b7b4947035d8446a16f7ad1e401cf6a8e 100644 GIT binary patch delta 8730 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

Z9F{mK4NMB2=0Jj#qqq7K?8 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 Ho9TZ68oRl| diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xls index 01ec6893d33393e51f04c07d53642284f3af7235..86b9efd23f7641e0e0cdec1fb2cc6178b83dddd1 100644 GIT binary patch delta 1289 zcmZ{kZEO@(6o%i^nc3Z${pfDHY-dZC-2zderQ4<S(JC=qB%DxVg@wxMo}F{K!6 zj7X>zbS85mk(m<@&cztlSKTJ&1Q4-jEIj1nz%qk@B1qs%^{vBxWj)+ zI#($=e=i02Z#lrv$Ys1*ykC-aPK$U$#1pcgf0Rr4MG=Fdy-;4jC!`{7R{VThaB6h!?t_4r+PzA5+Ubl}&)Z zbuHm9orRCg=$O5>0W+Nv{>dE`-=)|Sr9yVPgS_3dI_S*XTge3S#j3_RPl+r~ZtDHO zxL&lTl6p82E1$pNRiTHSnwz$6yt#f?%cjJ0P0t@Xh%$`x_E?y<@N2OU5%-DbGCmUv z)vdDU{!a&uC1R~g*Mnnp&{C_9y7ufi+xTE#DaPx$Fus<`jOO@S=ffIkFZQ4YRak=! zNZ?7V#6HZ##_+nc#kTwFfa7j{{Z5rO+767p1RU(-nslR~w4Boy+aN~AMN(}da#sk2 zkZfoWO@d9_4GqT6uXIbAbO`9~0b2Wvnsg}{yzhM2EN6(4sb6D+d$&#s8chiHf8>d3hoo!8w3 z+V~A%_buSr2{E9KjEmpg4x}b_(tQ4U@&_&Z7x1Ro_`8(Us7m(?<9B_!cZ|bnhgv_6 zpoR&~%q5lHEw@YNJe#d~?0jr*lw7G>6*Q#w*AkZ35ki@dD(RR1+GzcagwtCH#VzJU zTyZRt8F-3rhGrIO8LDmcPH&QQx#yw7cQa*4^2uI#@nhT8U!k~20PPo7y_I?V1zKUF qfz-<#bfDn9*37*Qx}XGeC)r6MF+_-sW}a+0mdSkANsFkbL;e?pZ)?o} delta 1298 zcmZ`(e`phT6n`&wmo&NNO!_0e+J>B)h;2=;oj)oSNp#a~N-Y69wUZ`ot%yREQAMqx z0r3Z@RC&6viu&I~7=wDV*Hx&Fj)4>gQ>PY$8vF%gf`Lt~472auHEFf<;NAD`^FHsr z&wG5o-^AZS;-zr9W}Xg{j|X6YeIm1WnM}q&e`Yq+A0eAFvFD4L<-h?)FKlU&cpp9F z=2DB`AxZd%2KfT2=ga9CFVjV4N146ji)bgqerMeI%qoR)dd11~74xkXJX)tvB%q59 zyVOz_EAwxL)&B_~tb`Td7b}mT2)s1viZV`>sJ71Js3vD7F3*B5odsWH;dI`uEIjM= zCdH%(ymJh&gCz*a7yJ@pp!&*)KijW{$q`iZs&heXH7}`z?Bs_b9z2g zjE^3>RW|uTNyS2zyp*;|YfGKkES3~sE{k?uD&hGzckCYRUcr}(@CYfPd1ap;WPEU7 zb7b?zRO9YgQ?w(pAtzpv6|+D*P%yi4zCl-9Dv=>1+`EOpTTN~!xW&6t{*D2r`H4YxhXPG zEsk^ojD7=fU>{H{-Jp46*X87Z1AP)_h-asP?RmCpFZZ9|#Mj3Fdd>he^%?9dni>x( z4jXe1;|4m_?N6S}!zH+k{HdY>B7dCn~p04a9fZ)q**!klm1b-oy(J%G@$kfQ0g`fe9qRvi3PL9{1V zRADVQj0?=7nA}x`!>)=Y2>ta4--XSvU=aT*&K4YZRWu^hZbs;h8D66+ed!uZ`KJ$K zD)Hnfle^mSoUZJ|HvD!Q%KV!x|0VSDZRq7azd}%Myp3Td3m!ZfIjFDPfpvDgn%vuo khi$9c^tYY(o8a$fZsS(d*vf7hxHkE3V1xQt7k-TY12hqIyZ`_I 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 ca20c158f2a48284479fe476dd43cfd7949a4390..ba72afadb8b07133f0cdf066bd08cc497f4c7718 100644 GIT binary patch delta 8819 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

p*Bnnq4&hEWBLTNw4k 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 From e1dbdacb85cb1bdcfdc7a678a9c5990db499a682 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 9 Nov 2021 17:30:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=20=E6=8C=89=E9=9C=80=E6=B1=82=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E4=BF=AE=E6=94=B9=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E5=AF=BC=E5=85=A5=E5=BD=93=E5=89=8D=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=BA=BA=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E7=9A=AE=E9=85=8D=E4=B8=8D=E4=B8=8A=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=88=8D=E5=BC=83=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NeighborHoodController.java | 2 +- .../epmet/service/NeighborHoodService.java | 2 +- .../service/impl/NeighborHoodServiceImpl.java | 28 +++++++++++++++---- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java index 8442207f1a..11e1f65d6b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java @@ -215,7 +215,7 @@ public class NeighborHoodController { } List result =importResult.getList(); // log.info(JSON.toJSONString(result)); - neighborHoodService.importExcel(customerId,result); + neighborHoodService.importExcel(customerId,result,tokenDTO.getUserId()); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java index f4c612a2b4..266c3b912d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java @@ -52,5 +52,5 @@ public interface NeighborHoodService{ */ void exportNeighborhoodinfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception ; - void importExcel(String customerId,List list); + void importExcel(String customerId,List list,String staffId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index ad24ef5ab8..fd19173837 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -4,9 +4,11 @@ import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.NeighborhoodConstant; @@ -238,7 +240,19 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { @Override @Transactional(rollbackFor = Exception.class) - public void importExcel(String customerId,List list) { + public void importExcel(String customerId,List list,String staffId) { + //2021.11.9 需求变更 当前工作人员只能导致自己所属组织下数据,网格名对应不上的数据舍弃【注:需求就这样】 sun + CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, staffId); + //组织名称不一样的数据舍弃 + Iterator iterator = list.iterator(); + while (iterator.hasNext()) { + IcNeighborHoodExcel obj = iterator.next(); + if (!obj.getAgencyName().trim().equals(staffInfoCache.getAgencyName())) { + iterator.remove(); + } + } + //end sun + //导入 if(CollectionUtils.isEmpty(list)){ return ; @@ -274,10 +288,14 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { entity.setCustomerId(customerId); entity.setNeighborHoodName(icNeighborHoodExcel.getNeighborHoodName()); - entity.setAgencyId(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName())).map(u->u.getId()).orElse("")); // agencyMap.get(icNeighborHoodExcel.getAgencyName()).getId()); - entity.setParentAgencyId(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName())).map(u->u.getPid()).orElse(""));//agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPid() - entity.setAgencyPids(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName())).map(u->u.getPids()).orElse(""));//agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPids() - entity.setGridId(Optional.ofNullable(gridMap.get(icNeighborHoodExcel.getGridName())).map(u->u.getId()).orElse(""));//gridMap.get(icNeighborHoodExcel.getGridName()).getId() + entity.setAgencyId(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName().trim())).map(u->u.getId()).orElse("")); // agencyMap.get(icNeighborHoodExcel.getAgencyName()).getId()); + entity.setParentAgencyId(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName().trim())).map(u->u.getPid()).orElse(""));//agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPid() + entity.setAgencyPids(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName().trim())).map(u->u.getPids()).orElse(""));//agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPids() + entity.setGridId(Optional.ofNullable(gridMap.get(icNeighborHoodExcel.getGridName().trim())).map(u->u.getId()).orElse(""));//gridMap.get(icNeighborHoodExcel.getGridName()).getId() + //网格名对应不上的数据舍弃 + if ("".equals(entity.getGridId())) { + continue; + } entity.setAddress(icNeighborHoodExcel.getAddress()); entity.setRemark(icNeighborHoodExcel.getRemark()); neighborHoodEntityList.add(entity);