From a8097c956981712ac4a9938eccdc4cab8c3e4fd5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 29 Jul 2022 16:20:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=80=BB=E8=AE=A1=20=E4=BA=BA=E5=9D=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/controller/GovOrgController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 83ae19c53b..bbf8011130 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 @@ -498,13 +498,15 @@ public class GovOrgController { 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("合计"); + if (NumConstant.ZERO != sum.getMemberCount()) { + sum.setProjectAve(sum.getProjectCount()/sum.getMemberCount()); + sum.setClosedAve(sum.getClosedCount()/sum.getMemberCount()); + } List list = new ArrayList<>(); list.add(sum); excelWriter.write(list, writeSheet); From d3c26eb07faf3f1cea1fa1b8f521d168c268b7a0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 29 Jul 2022 17:48:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java index 70b6bdb9ae..8e6ab35c55 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java @@ -149,7 +149,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { } JSONObject jsonObject = JSONObject.parseObject(submitResult.getData()); result.setErrorCode(jsonObject.getInteger(ERR_CODE)); - result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE))); + result.setErrorMsg(jsonObject.getString(ERR_MSG)); result.setData(jsonObject.getString("auditid")); return result; }