From f6699621e75e830ed4bd7d10fc06ad0d101bbc97 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 10:45:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=85=9A?= =?UTF-8?q?=E5=BB=BA=E6=B4=BB=E5=8A=A8=EF=BC=8C=E5=88=97=E8=A1=A8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/result/IcPartyActPageResultDTO.java | 3 +++ .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java index f28f8a0083..3af4e5509a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.partymember.dto.icpartyact.result; +import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -79,5 +80,7 @@ public class IcPartyActPageResultDTO implements Serializable { private List joinOrgList; //导出用 private String joinOrgNameStr; + + private List attachments; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index c5d1d7244b..8d6142864d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -8,6 +8,7 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -290,6 +291,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl{ l.setJoinOrgList(icPartyActOrgDao.selectJoinOrgList(l.getIcPartyActId())); + l.setAttachments(resiPartymemberAttachmentDao.selectListByBusinessId(l.getIcPartyActId())); }); } return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); From 33ee70df725fa897919832982a94cc81badfd838 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 11:19:18 +0800 Subject: [PATCH 2/5] fix --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 8d6142864d..0aabe4a1d1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -289,11 +289,16 @@ public class IcPartyActServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.selectPageList(formDTO)); if(!formDTO.getIsPage()){ + // 不分页 pageInfo.getList().forEach(l->{ l.setJoinOrgList(icPartyActOrgDao.selectJoinOrgList(l.getIcPartyActId())); - l.setAttachments(resiPartymemberAttachmentDao.selectListByBusinessId(l.getIcPartyActId())); }); } + + pageInfo.getList().forEach(l->{ + l.setAttachments(resiPartymemberAttachmentDao.selectListByBusinessId(l.getIcPartyActId())); + }); + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); } From 459ad8bea0e79cd7a8b05491e556893949815998 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 12:07:23 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E3=80=90=E7=81=B5=E5=B1=B1=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F-=E6=8C=89=E7=BB=84=E7=BB=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=9A=E5=BB=BA=E6=B4=BB=E5=8A=A8=E7=BB=9F=E8=AE=A1=E3=80=91?= =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BC=A0=E5=85=A5=E7=BD=91=E6=A0=BCid?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LingShanScreenServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java index 274ebff387..92498cb55f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.enums.GenderEnum; import com.epmet.commons.tools.enums.PartyOrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; @@ -223,7 +224,15 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD */ @Override public List actQtyOfPartyOrgStats(String agencyId, Date holdTimeStart, Date holdTimeEnd) { - AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + ArrayList rl = new ArrayList<>(); + AgencyInfoCache agencyInfo = null; + try { + agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + } catch (Exception e) { + logger.warn("【灵山大屏-按组织查询党建活动统计】" + ExceptionUtils.getErrorStackTrace(e)); + return rl; + } + if (agencyInfo == null) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前组织信息失败，agencyId:" + agencyId, "查询当前组织信息失败"); } @@ -298,7 +307,6 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD } // 将结果map转化为list，返回 - ArrayList rl = new ArrayList<>(); orgDimMap.forEach((actType, orgStatsMap) -> { LingShanScreenPartyActQtyStatsResultDTO re = new LingShanScreenPartyActQtyStatsResultDTO(); From cae9ea93962a666dda77b151fdef0482842e4558 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 12:10:44 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E3=80=90=E7=81=B5=E5=B1=B1=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F-=E6=8C=89=E7=BB=84=E7=BB=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=9A=E5=BB=BA=E6=B4=BB=E5=8A=A8=E7=BB=9F=E8=AE=A1=E3=80=91?= =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BC=A0=E5=85=A5=E7=BD=91=E6=A0=BCid?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LingShanScreenServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java index 92498cb55f..2051ed9cd5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java @@ -97,7 +97,14 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD @Override public List partyActTypeAndQuantity(String agencyId) { - AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + AgencyInfoCache agencyInfo = null; + try { + agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + } catch (Exception e) { + logger.warn("【灵山大屏-按活动类型查询党建活动统计】" + ExceptionUtils.getErrorStackTrace(e)); + return new ArrayList<>(); + } + if (agencyInfo == null) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前组织信息失败，agencyId:" + agencyId, "查询当前组织信息失败"); } From c0716b14ac342955c64bf7ffd05369fcaaaab8e3 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 May 2023 13:01:19 +0800 Subject: [PATCH 5/5] fix --- .../src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index d81f18e48b..8a5c4724d9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -314,7 +314,7 @@ from ic_party_org o left join ic_party_member m on (o.ID = m.SSZB and m.DEL_FLAG = 0) where o.DEL_FLAG = 0 - and o.AGENCY_PIDS like #{orgId} + and o.AGENCY_ID like #{orgId} and o.PARTY_ORG_TYPE = 5 group by o.ID, o.PARTY_ORG_NAME, o.LATITUDE, o.LONGITUDE