Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

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<JoinOrgDTO> joinOrgList;
     //导出用
     private String joinOrgNameStr;
+
+    private List<FileCommonDTO> attachments;
 }
 

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;
@@ -288,10 +289,16 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         PageInfo<IcPartyActPageResultDTO> 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()));
             });
         }
+
+        pageInfo.getList().forEach(l->{
+            l.setAttachments(resiPartymemberAttachmentDao.selectListByBusinessId(l.getIcPartyActId()));
+        });
+
         return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
     }
 

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;
@@ -96,7 +97,14 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD
 
     @Override
     public List<LingShanScreenPartyActTypeAndQtyResultDTO> 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, "查询当前组织信息失败");
         }
@@ -223,7 +231,15 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD
      */
     @Override
     public List<LingShanScreenPartyActQtyStatsResultDTO> actQtyOfPartyOrgStats(String agencyId, Date holdTimeStart, Date holdTimeEnd) {
-        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId);
+        ArrayList<LingShanScreenPartyActQtyStatsResultDTO> 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 +314,6 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD
         }
 
         // 将结果map转化为list，返回
-        ArrayList<LingShanScreenPartyActQtyStatsResultDTO> rl = new ArrayList<>();
 
         orgDimMap.forEach((actType, orgStatsMap) -> {
             LingShanScreenPartyActQtyStatsResultDTO re = new LingShanScreenPartyActQtyStatsResultDTO();

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
     </select>