From ceaec34b3adf1401fdef18fdae0562df5f9d8b0b Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Jul 2022 17:19:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1,=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GovOrgController.java | 21 +++++++++++-------- .../govorg/impl/GovOrgServiceImpl.java | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 3e1b51fd32..83ae19c53b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -487,24 +487,27 @@ public class GovOrgController { excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), OrgProjectDetailExcel.class).build(); PageData page = null; WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + OrgProjectDetailExcel sum = new OrgProjectDetailExcel(); do { page = govOrgService.orgProjectDetailList(tokenDto, formDTO); List list = ConvertUtils.sourceToTarget(page.getList(), OrgProjectDetailExcel.class); list.forEach(item -> { item.setIndex(i.getAndIncrement()); }); - OrgProjectDetailExcel sum = new OrgProjectDetailExcel(); - sum.setIndex(i.getAndIncrement()); - sum.setOrgName("合计"); - sum.setMemberCount(list.stream().mapToInt(OrgProjectDetailExcel::getMemberCount).sum()); - sum.setProjectCount(list.stream().mapToInt(OrgProjectDetailExcel::getProjectCount).sum()); - sum.setClosedCount(list.stream().mapToInt(OrgProjectDetailExcel::getClosedCount).sum()); - sum.setProjectAve(list.stream().mapToInt(OrgProjectDetailExcel::getProjectAve).sum()); - sum.setClosedAve(list.stream().mapToInt(OrgProjectDetailExcel::getClosedAve).sum()); - list.add(sum); + + sum.setMemberCount(sum.getMemberCount() + list.stream().mapToInt(OrgProjectDetailExcel::getMemberCount).sum()); + sum.setProjectCount(sum.getProjectCount() + list.stream().mapToInt(OrgProjectDetailExcel::getProjectCount).sum()); + sum.setClosedCount(sum.getClosedCount() + list.stream().mapToInt(OrgProjectDetailExcel::getClosedCount).sum()); + sum.setProjectAve(sum.getProjectAve() + list.stream().mapToInt(OrgProjectDetailExcel::getProjectAve).sum()); + sum.setClosedAve(sum.getClosedAve() + list.stream().mapToInt(OrgProjectDetailExcel::getClosedAve).sum()); excelWriter.write(list, writeSheet); formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize()); + sum.setIndex(i.getAndIncrement()); + sum.setOrgName("合计"); + List list = new ArrayList<>(); + list.add(sum); + excelWriter.write(list, writeSheet); } catch (EpmetException e) { response.reset(); response.setCharacterEncoding("UTF-8"); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index dc3c3a5d8b..8aa7467ca8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1264,7 +1264,7 @@ public class GovOrgServiceImpl implements GovOrgService { public PageData memberProjectInfoList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); PageData result; - if (StringUtils.isBlank(formDTO.getAgencyId())) { + if (StringUtils.isBlank(formDTO.getOrgId())) { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); if (null == staffInfo) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); From 70f27851439fcb5a72d35ed2825618935a592359 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Jul 2022 17:21:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1,=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/excel/MemberProjectInfoExcel.java | 4 ++-- .../epmet/dataaggre/excel/OrgProjectDetailExcel.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java index e7b5e2045c..a742bd1546 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java @@ -30,11 +30,11 @@ public class MemberProjectInfoExcel { @ColumnWidth(20) @ExcelProperty(value = "上报数量",order = 4) - private Integer projectCount; + private Integer projectCount = 0; @ColumnWidth(20) @ExcelProperty(value = "办结数",order = 5) - private Integer closedCount; + private Integer closedCount = 0; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java index 91b30e0e89..49aeaf9317 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java @@ -26,22 +26,22 @@ public class OrgProjectDetailExcel { @ColumnWidth(20) @ExcelProperty(value = "网格员数",order = 3) - private Integer memberCount; + private Integer memberCount = 0; @ColumnWidth(20) @ExcelProperty(value = "上报数量",order = 4) - private Integer projectCount; + private Integer projectCount = 0; @ColumnWidth(20) @ExcelProperty(value = "办结数",order = 5) - private Integer closedCount; + private Integer closedCount = 0; @ColumnWidth(20) @ExcelProperty(value = "人均上报",order = 6) - private Integer projectAve; + private Integer projectAve = 0; @ColumnWidth(20) @ExcelProperty(value = "人均办结",order = 7) - private Integer closedAve; + private Integer closedAve = 0; } \ No newline at end of file